tree 0f03a2c0e166bac89ab829035490e9c6de08d534
parent fe32f2ff16006d0ca461076f4e809a7dfc5563a1
parent 42b056dc3eaf4b07445ea207b1b5ab15fa5918bb
author The Android Open Source Project <initial-contribution@android.com> 1363797152 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1363797152 -0700

Reconcile with jb-mr2-release - do not merge

Change-Id: I4e399f8f0b110b7b46c6cf6a65fdc908acb4f9ce