tree b479405e32012ceefec3f433e6d45745492bd6ce
parent 9d2334a3913707944fe120f1f317e0955c897f95
parent 0afc1f60b1374feb36012c9248adead192a7f081
author The Android Open Source Project <initial-contribution@android.com> 1346947935 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346947935 -0700

am 0afc1f60: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0afc1f60b1374feb36012c9248adead192a7f081':