tree 04407d67a42e2736fb0cad90f62a3bebe9d2595b
parent 1ca4061cd7ff214e5c8933e880290c53c70dd389
parent 192690b863a912fb1c1e7a7620ad6915933f9662
author The Android Open Source Project <initial-contribution@android.com> 1352233805 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233805 -0800

am 192690b8: am 992df2fa: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '192690b863a912fb1c1e7a7620ad6915933f9662':