tree 3839c4df6e46ad8490e6c0ed5cb7f0b46c67498d
parent 0d657a1fd8d63e5f2d992a11a9ee20267f3d47c0
parent 34716a89e247aff6853122472a09762eed4a2fc6
author The Android Open Source Project <initial-contribution@android.com> 1365691853 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365691853 -0700

am 34716a89: Reconcile with jb-mr2-release - do not merge

* commit '34716a89e247aff6853122472a09762eed4a2fc6':