tree 949deb9a50bab5bc45e16e2fde02d98ca3206118
parent 7eda13fbe8b2a35c9fcbfd7fd7e0ac79fda51ad6
parent d1c1988f1dea1c2946cca61144229eb74c893630
author The Android Open Source Project <initial-contribution@android.com> 1354066416 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354066416 -0800

am d1c1988f: (-s ours) am 6a93582c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'd1c1988f1dea1c2946cca61144229eb74c893630':