tree 365346b4c877d12cf28507fb6c538bf130e4effe
parent 3a637344dd7e6455f7a6ac80ad93e1ea2fb97c5a
parent 3e956208e08b54792209a38bd4e3a01f8fe64109
author The Android Open Source Project <initial-contribution@android.com> 1343431433 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343431433 -0700

am 3e956208: am 062347a0: am 115b146c: Reconcile with jb-mr0-release jb-release

* commit '3e956208e08b54792209a38bd4e3a01f8fe64109':