tree 235d3dbfedef2f430810e385904b288f4d8af991
parent 144b27ecdc6a95ae55a1d09213c9f447420b4c04
parent b24e661c66f1f75828f82a3e70a49ef93b2c434a
author The Android Open Source Project <initial-contribution@android.com> 1351866622 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351866622 -0700

am b24e661c: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b24e661c66f1f75828f82a3e70a49ef93b2c434a':