tree 5a1d6deaceee8a0181d2bfe3fb2e1f55e76ed78c
parent ac19623f88203247cf4b710bdc70e3c26b18bdee
parent 7398664de30cf953b791ab5aeeb37dfd57410698
author Jean-Baptiste Queru <jbq@google.com> 1363034967 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363034967 +0000

am 7398664d: am c8b3fee4: am f9094401: am 75f29709: am 09b43645: (-s ours) am 92b2cd23: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7398664de30cf953b791ab5aeeb37dfd57410698':