tree 943d5802052548f27bdaac3ed97b784c8b142b26
parent 0db6a9e9a67e7e370cb55d3b4a1d855be9b80f98
parent 94c31c85f67ff10a1ea496ce9ea12809174f72c0
author Jean-Baptiste Queru <jbq@google.com> 1361918264 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1361918264 -0800

am 94c31c85: am d4ed4363: (-s ours) am 909960ad: (-s ours) am ed9cc555: Reconcile with jb-mr1-release - do not merge

* commit '94c31c85f67ff10a1ea496ce9ea12809174f72c0':