tree ed992e44215d76d5a240c51809e207c0bf8c3385
parent 109722fa53e950991aaef01c0262aadb42733479
parent baae9c89e1d07bbdf01612aeb710af49ad982f60
author The Android Open Source Project <initial-contribution@android.com> 1349793060 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349793060 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I91388e10ace70e946c571c5a54438cfc0f96a2f4