tree 9a3910b32d912bdb237ef87dbd297fe2d4dabe44
parent 0c434b58efa2dbe21ce9b8d20e6bc0328147080b
parent bbbeeb3c6f2a9a09b1ec952ba9a443f248f922e8
author The Android Open Source Project <initial-contribution@android.com> 1349793068 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349793068 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I598988c7b0ec650064de569c6120b27c724c478e