tree aee8594b43800f6d56f8b5f78062fced5af5b5a7
parent 50926ed43509b7d16a2c4b9375f53986cc9a28b7
parent 5897310688b2d325dc2e437f6f3811e298b21810
author Jean-Baptiste Queru <jbq@google.com> 1349303197 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349303197 -0700

am 58973106: (-s ours) Reconcile with jb-dev - do not merge

* commit '5897310688b2d325dc2e437f6f3811e298b21810':