tree 9ad0214d1a484baa548494a080217ca9738feedf
parent d09ee48e1cd72e2b14cdba926a409fec3c9fbe43
parent da8940f4e81a3f56ace5699b89cc4e09779904ef
author Jean-Baptiste Queru <jbq@google.com> 1363034667 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034667 -0700

am da8940f4: am 71dc25d1: am 58ac2762: am a03f07f0: (-s ours) am d2e43dce: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'da8940f4e81a3f56ace5699b89cc4e09779904ef':