tree 50e18099a6e5cf9562f535de599d9b0e8316db66
parent a476f87a5de49dc3a425fd0f4fe115d30a478d95
parent 963a513ae15ebf9c7abcce70cc8d52703841b6e5
author The Android Open Source Project <initial-contribution@android.com> 1343771713 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343771713 -0700

am 963a513a: (-s ours) am dccf2260: (-s ours) Reconcile with jb-mr0-release - do not merge

* commit '963a513ae15ebf9c7abcce70cc8d52703841b6e5':