tree d5f9daedb45d28c7ae2ebe1b325d99464becab83
parent 688b235bfbad9fcd60fbc44ef4bb2c23bb94e241
parent 8b40761ad0efad7d428c6268e3324d0dd8101481
author Jean-Baptiste Queru <jbq@google.com> 1363030113 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030113 -0700

am 8b40761a: (-s ours) am 35cf1243: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8b40761ad0efad7d428c6268e3324d0dd8101481':