tree 66cacc7845f482311eeb5ed38fadba936e3bd659
parent 4d36be5ac4f128531865d706359ec10f7ab5996a
parent 3e40565ed1093d446ed76fc9247f9d7ea06fd5bd
parent 5f2aa980c32141249ecec2d0ce450cb55d082721
author The Android Open Source Project <initial-contribution@android.com> 1350052320 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1350052320 -0700

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

Change-Id: If20e289cd34c19f80f7c2ad19587d19483a7700f