tree 712613768b3e8e60adb7e37aaa0b992c8862d35b
parent 05989772d5b46cd5328e88d546f04deef39cc3c8
parent 2fef5c45e7e78e4209f397020c5008116899bc11
author The Android Open Source Project <initial-contribution@android.com> 1354895595 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1354895595 -0800

Reconcile with jb-mr1.1-release - do not merge

Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af