commit | b8f80e58b2bf3727e16f290f9abf01c6822adfe6 | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:04:53 2012 -0700 |
committer | The Android Open Source Project <initial-contribution@android.com> | Tue Aug 21 16:04:53 2012 -0700 |
tree | 7771164ec3f2bdfc6b00e3a21f8fee9ba238f2e5 | |
parent | dc679a65073af0bbab658b9e28be9b8631ed2f6b [diff] | |
parent | da8aa379224fbc1d1db95cd2a20301b2492aad7c [diff] |
Reconcile with jb-mr1-release - do not merge Change-Id: I4ab99f1afaeb5abf8220704807cdd9d0fcd45f9d