tree 52610baba474df56aca468336f7da3b89a91b645
parent f99f5e89a15cada28dc692a5a7ce3413bdd965b4
parent d84f02944f78595c3f72eb7e8bc422c63bd6ce89
author The Android Open Source Project <initial-contribution@android.com> 1352393764 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352393764 -0800

am d84f0294: Reconcile with jb-mr1-release - do not merge

* commit 'd84f02944f78595c3f72eb7e8bc422c63bd6ce89':
  JOP38C
  JOP38B