tree bf0f47848a330918eece8f756ab9cf51eb687f4c
parent f8b719552d3cf2cdb56ff8a08833438195835414
parent d765cd646e2b22f95c840426926127a714b8dc94
parent 97690417fba0fd40996babab0349c2ea6d002f6e
author The Android Open Source Project <initial-contribution@android.com> 1349887505 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349887505 -0700

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

Change-Id: Iddfb8f231599cb4d38212670febe9048cc97b572