tree b8d61f9d1797ea60b94609cbb758e2ff0c16b467
parent 910c52b8626eef4ad47e845a1821c627bd1569b2
parent ad52877f54f7d7730cf79c80ef92d870537dd12e
author The Android Open Source Project <initial-contribution@android.com> 1348162525 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1348162525 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ibd9aeb4e99444c330c4ab0dcaf510100ad0b6aea