tree 27cc8a28f19cff95a624feb06e88acae9faea52b
parent 8bcb7e5fdf552c823f4fe54b6400fb2a0ecd3f30
parent a691d4ca772292f881b3842c42ff67da88a2c7cc
author The Android Open Source Project <initial-contribution@android.com> 1342713155 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1342713155 -0700

am a691d4ca: Reconcile with jb-mr0-release

* commit 'a691d4ca772292f881b3842c42ff67da88a2c7cc':