tree 1445e27659322488b855bef2aea88041be0656b7
parent b4e634fd05cde3d2a38634b795f21586a789d7be
parent 43e17d5fbf8786ccbeaf64a6dae8643d1daae2b9
author The Android Open Source Project <initial-contribution@android.com> 1346105836 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346105836 -0700

am 43e17d5f: am e4b6c5dd: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '43e17d5fbf8786ccbeaf64a6dae8643d1daae2b9':