tree acfc8b558580f0421840af5f9e94b328e18c1a90
parent ca863c08ce349739af1bf1fd5a13f988b93c6fca
parent 20a08cc9916a2a65a557f533a6bdc2878b1bddef
author The Android Open Source Project <initial-contribution@android.com> 1351700575 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351700575 -0700

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

* commit '20a08cc9916a2a65a557f533a6bdc2878b1bddef':