tree 11e2d8933a0a00dc6dd9d43c215c8c59dae20e82
parent 8eaf1e82f612dc72ff7f91cdf23e4485e9efa27d
parent cfb57b89a616b77d42c76dfdd11a38076e080cf5
author The Android Open Source Project <initial-contribution@android.com> 1349450268 -0700
committer The Android Open Source Project <initial-contribution@android.com> 1349450268 -0700

Reconcile with jb-mr1-release - do not merge

Change-Id: Ie6a1ea3624cfc602d4b3d6be7a6037255f6ef5cc