tree cbb8580da17f4350d0dfd8650a7af6d58a3fa612
parent f389189dff0cfb4c449991a1385c23695894cc2e
parent 42683cc2cea897d4696b233c48bfd7d49f5dab46
author The Android Open Source Project <initial-contribution@android.com> 1365613702 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365613702 -0700

am 42683cc2: Reconcile with jb-mr2-release - do not merge

* commit '42683cc2cea897d4696b233c48bfd7d49f5dab46':