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

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

* commit '56f387a4a8f319f3e6080b5e5963a4b177053cbe':