tree 4ca85ee344a724c3188d11a60f1b260dd29b263f
parent b4a3465f355a297e4df0973fae685174d397d855
parent 0049a47e7be990283e235de19d9cd6ef75528fd2
author Jean-Baptiste Queru <jbq@google.com> 1363032830 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363032830 -0700

am 0049a47e: am 834f2f66: am 61d900bd: (-s ours) am 28bf428c: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0049a47e7be990283e235de19d9cd6ef75528fd2':