tree d8c3067833c9a03bfc8394fff17a1e51126ef837
parent 1a42587d775c6dc8df4f40c960d866376150b0d7
parent 40e8ada0298ab2b57a170b7bcc37eb4c05eb3db7
author Jean-Baptiste Queru <jbq@google.com> 1363034680 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363034680 -0700

am 40e8ada0: am cbec21ad: am f0f706bc: am dda70146: (-s ours) am 77a62c8b: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '40e8ada0298ab2b57a170b7bcc37eb4c05eb3db7':