tree 50d24b67ee771ac64ca2bb3779586b802e96b34f
parent 25b425170d9cc0b8d1d5ac92f2dfc9d2a8933df7
parent 4ca95d521a6c71dfd7d0f992aa3facbe961d7893
author The Android Open Source Project <initial-contribution@android.com> 1352233265 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233265 -0800

am fb8b02eb: am 073d6225: Reconcile with jb-mr1-factory-release - do not merge

* commit 'fb8b02ebb853aefb911690d6dd5e89ad68fa905d':