tree fb90bdf484d931322c08707793da1131a96353f0
parent c3a7c3839ee79260682a9c3dcb32e9474daa7481
parent bc74447080e16c3171229231021ad5ee217b690c
author The Android Open Source Project <initial-contribution@android.com> 1352234406 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352234406 -0800

am bc744470: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'bc74447080e16c3171229231021ad5ee217b690c':