tree b48b0cebb89bb33fea47fc25da4184833ba46f68
parent 43bd832d128726334de622d67aaac09051c07941
parent 2de86a4e1b6ab21f24d9bb269d1e1ad862d7758e
parent a4927aea774d4d4f792560e39ee0f3f2a4d5e9ef
author The Android Open Source Project <initial-contribution@android.com> 1349887481 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349887481 -0700

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

Change-Id: I9b2354f718f8e792bd040b7fb92f8fd1c77c037a