| commit | 3c0c192cdfc960165151fd305241b527736e9387 | [log] [tgz] |
|---|---|---|
| author | Michael Jurka <mikejurka@google.com> | Thu Nov 10 15:00:34 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 10 15:00:34 2011 -0800 |
| tree | 83baddf11e60cb2b8d17bec31c97bfb8bd35b456 | |
| parent | ba1a7be15cb84ad82b9d7c625d0afd00d79a84b0 [diff] | |
| parent | dde558b8b8bcf3fac6d2ceceafa1f7546f98a264 [diff] |
Merge "resolved conflicts for merge of b9c76f32 to ics-mr1" into ics-mr1