tree 243be38fb074a20becfb33ea81b7988a7f3caeec
parent 816227873e7f8a88109081013bd8392de55a7424
parent cb671fc81f9ecf64b868fabcbdce1276d9b0ea3c
author The Android Open Source Project <initial-contribution@android.com> 1355956539 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355956539 -0800

am cb671fc8: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit 'cb671fc81f9ecf64b868fabcbdce1276d9b0ea3c':