tree 0f338e85b5eb82215070d02f8e7d530819691414
parent 1ed1a2641e07daf80d7a9dda693b4384ad8d0b37
parent 0045f1cb3732dc3b063daf6e2376b2f88a5cb995
author The Android Open Source Project <initial-contribution@android.com> 1346943235 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1346943235 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Id3157ca77b5d15212de07d443e5f26a2c4db80fa