tree c3c3d35ebb06e219bf41460f70c98ebd6ee828d3
parent 6016d08b0c3b682f1f7000b42a9ea4b6b6d74f22
parent 5afeff505e28707c6672ccb7897397d8e3821796
parent a88a3b35960e5c12fd4de18c58376d9c78e19043
author The Android Open Source Project <initial-contribution@android.com> 1352232964 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352232964 -0800

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

Change-Id: Ibef4c059b7a7e055fe562c60656a9f7f7de4841a