tree 178854b2917d9d46c37533ad3066a1d53ff650dd
parent 49adc03188a8986a0fb2c7bd2ab32b938d315000
parent d3c70e1e519d3646beb96255adbdf2bc736b2d5e
author The Android Open Source Project <initial-contribution@android.com> 1349967960 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349967960 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: I79576b76e16ecd842c900211ae70c22d4ae0004d