tree 536b56e71c13fdb51e562a15b96e93a7cb9cd052
parent c560a67b12350102ba237fa70cedc7c972ad4e4b
parent f91bd41c46ec8bd085c361ea0bdf53efe13c87ca
author Jean-Baptiste Queru <jbq@google.com> 1363030319 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363030319 -0700

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

* commit 'f91bd41c46ec8bd085c361ea0bdf53efe13c87ca':