tree c3c3d35ebb06e219bf41460f70c98ebd6ee828d3
parent 4b57f8f2affade295ec856e2bc63ba02e9f079c4
parent 5afeff505e28707c6672ccb7897397d8e3821796
parent a88a3b35960e5c12fd4de18c58376d9c78e19043
author The Android Open Source Project <initial-contribution@android.com> 1349887424 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349887424 -0700

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

Change-Id: I3afa60bf8978d750c7072128e9f5e87c5d624b36