tree 0cf8ab227bb7224b7a3705a3ccf451c35c5fcfbf
parent 5d1e9a5f54d0937e7e5565687b3cc85791239c6d
parent 560e16197a607715ac9a2b26ce40928a5e782280
parent c242ae404d2e2dadf16284b5d367f5523fbafc75
author The Android Open Source Project <initial-contribution@android.com> 1349887534 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349887534 -0700

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

Change-Id: I6765f8f1401d75061c1ce4942c67bd6b4a74d286