tree e5859691eec11c67ec5d9b33b983a949ec944c7f
parent 43be13a7c7968ba079c87fed7143ec4b6c642b2e
parent a5e1ef4ee0f02d186c96f40690f880e949d10b73
author Jean-Baptiste Queru <jbq@google.com> 1363032814 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032814 -0700

am a5e1ef4e: am 9576bbd3: (-s ours) am 810a7295: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a5e1ef4ee0f02d186c96f40690f880e949d10b73':