tree 26878ce2fbb731f6cdd47a55ff1cfae54e9e58ee
parent f0ff908da019a44115109f1b4d1b6864b35a8a29
parent a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c
author Jean-Baptiste Queru <jbq@google.com> 1363030907 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030907 -0700

am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c':