tree 6fd0a882951c48ec8d21b63db5b5442b11748376
parent d24896cf3f4e91dd7bfa0abbd0677ec6edae0529
parent 36b4980ac6cbcabf25364122e67cb157b80298ff
author The Android Open Source Project <initial-contribution@android.com> 1363797720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363797720 +0000

am 36b4980a: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '36b4980ac6cbcabf25364122e67cb157b80298ff':