tree 711da040a2db1917932a617bf570f86f14329c70
parent 834eb9d9f3e3830153caa193eae4009bbf691a6f
parent 9f4766c9a7296efd9c8fe550b8d4cd832ae011a5
author The Android Open Source Project <initial-contribution@android.com> 1349274900 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349274900 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ic678a9ac8903330314ffcf430137c2873a34c4ce