tree e71a7efce51438722034e19cbcfb0936fae31e0d
parent ffa7e1739cd14e7a5127ec065726625cfcaed183
parent b1024993b102294abd48c4a9cc705c0b7bd83fb7
author The Android Open Source Project <initial-contribution@android.com> 1352312403 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352312403 -0800

Reconcile with jb-mr1-release - do not merge

Change-Id: Ib4bc9a66f8bec3fb2d512fd7d25cfebf192e0009