tree 954855c4be35ffeb2a737ca3acc67248fef6a243
parent 82c0fe723c1542023fe0e61bc628b8a729be1692
parent 37f93295e12b1727108a8d923cd64de2e87d6a69
author The Android Open Source Project <initial-contribution@android.com> 1349793027 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349793027 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I76401e4d503b987805ad009441310290bef71483