tree 7216f1b921c36dc9fd95a821d1f6a8e630644209
parent 43b596b4b96b7cba7164291b52787e5c62098fd8
parent dcf82f802deda3554c79a4e6f71249770be3c9a9
author The Android Open Source Project <initial-contribution@android.com> 1368708245 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1368708245 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: Idda6bd6033cfd90ecd4a54ccd3e286940ad12d5a