tree 64807edcb65fd2abd80c19c79cad6986f99ca396
parent 6fd59ac07d91eb373f4269a40e688aa82a6ccc6e
parent b5bd4fb79544b1939e9f977a88a707bdc90cf66c
author Jean-Baptiste Queru <jbq@google.com> 1363032335 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363032335 +0000

am b5bd4fb7: (-s ours) am 2f50df00: am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b5bd4fb79544b1939e9f977a88a707bdc90cf66c':