| commit | bd98fec2ab633eb81102b3424ba258b24876e887 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:17:48 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 05 08:17:48 2012 -0700 |
| tree | 11e2d8933a0a00dc6dd9d43c215c8c59dae20e82 | |
| parent | 8eaf1e82f612dc72ff7f91cdf23e4485e9efa27d [diff] | |
| parent | cfb57b89a616b77d42c76dfdd11a38076e080cf5 [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Ie6a1ea3624cfc602d4b3d6be7a6037255f6ef5cc