tree e5fadb2f26899bc340141accfe01cb9fff7cd21c
parent f45ffab037ff8ea5dc0ee8cd91c554baba77b249
parent 72034c6c5ff3f2114f9ed4dbade58e8fabddad03
author The Android Open Source Project <initial-contribution@android.com> 1349968101 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349968101 -0700

am 8616d32f: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '8616d32f7382563a1aea192e835b2cbbefd9f481':