| commit | 35795504755b8b658eb0795beb9463c69101eea8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Aug 02 15:09:15 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 02 15:09:15 2012 -0700 |
| tree | 04a192c984360f002f74c8be947a50bd304b3c99 | |
| parent | 8d2794be0c65f93f19632e811343aab56bb51242 [diff] | |
| parent | f6f6cfc17f89350f37cee1549533778ade226437 [diff] |
am f6f6cfc1: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'f6f6cfc17f89350f37cee1549533778ade226437':