tree 84363855e22bd883dea8b56ac8418fb73017d96b
parent d881a0ce901d839282ba2d4d724b9ae25c9d4e89
parent 6cf5cc66645acb39168ecd05c3cd8bbc8421a20c
parent 7219980a19c026fb454c1decdd2eacd22691df6b
author The Android Open Source Project <initial-contribution@android.com> 1352233065 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233065 -0800

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I088f7356b684381f971b7e9f6773ba24f7f9b62a