tree ea285cc37eadc8786c4491de6081ae24cbd18ba6
parent 86245a3511a2aaebe50c25c89170b5bb0d6cb501
parent 0160b3bd9eb2de45f56bcac3a5c27e4e5b183feb
author The Android Open Source Project <initial-contribution@android.com> 1343429159 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343429159 -0700

am 0160b3bd: Reconcile with jb-mr0-release

* commit '0160b3bd9eb2de45f56bcac3a5c27e4e5b183feb':