tree 3f5e3e579e1bfa61463938a0ac6014e853f4c9bf
parent 33b5dfb684910c5dbcd0e58f24a90ead01078629
parent 840d233c12200de9260c85d6eadbc73b41cef00b
author Jean-Baptiste Queru <jbq@google.com> 1371187889 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1371187889 -0700

am 840d233c: am 800e4320: am 63c34b5e: am 68719a17: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '840d233c12200de9260c85d6eadbc73b41cef00b':