| commit | d073e48edade9770e9b68952ce1682e99a000c50 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:02:43 2012 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 07 11:02:43 2012 -0700 |
| tree | 41903aeb26273ff2dae81d4d2a5975bbade3384f | |
| parent | 67c132e48b008ef8eaca3ec23114856c46da7ad9 [diff] | |
| parent | 3b29b18969d68d7f6f212e29ad45d9d7dc9b3f1e [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: Idbc421f8f1ee7d622a9015ab0648b450e74ca040