tree 0b66c9a2749aeaa67eb630f4528172313f256b28
parent 28d60bc2da19821af82d983902c3c78c078343c3
parent 394bb4549513bfc3555d7323e0c8841f93d97e0f
parent 5fe50819a621ce7d0f3ac701459498eeab5a23d6
author The Android Open Source Project <initial-contribution@android.com> 1352233033 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1352233033 -0800

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

Change-Id: I10aa690a24bdda6d980ae5ab4f90ab5fa02ba165