tree 4d1cf7a2c366d85a06ec8c2ebc2704e7641129f8
parent 72f83fe83242142ad3f10fb87f19e6d7d33b7c49
parent 4fea7c7372bec27a4489e511dcdd7f24bdd1fc2a
author The Android Open Source Project <initial-contribution@android.com> 1349792971 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349792971 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I9083ad000467a93228455a796ffcd353f097a0d8