tree 737b4e0a0e4922167f0f3f34087a5d945d98b264
parent 463539424d03ecd2f2a7470bb24f4826b03a80ab
parent 68f7fb1cd4ab8a2c427dfe45cb194fea5a9a989a
author The Android Open Source Project <initial-contribution@android.com> 1363797170 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1363797170 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I826424d8cfe5a04e8cbf0b623863a6476b0bf128