| commit | 69a278f679bcc7f3c65edd909dd1468e09194d11 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 05 15:58:51 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 15:58:51 2013 +0000 |
| tree | 652f9d62d26f96e23673b8f59f6685c78967789b | |
| parent | 3f794facd38b117064c35bf84595ed42c1ed847b [diff] | |
| parent | adff4e8630e8d468253255b521caecfbb161dbbe [diff] |
am adff4e86: (-s ours) Reconcile with jb-mr2-release - do not merge * commit 'adff4e8630e8d468253255b521caecfbb161dbbe':