| commit | bcc8233be93ce2be4e8946ddcd5c33232c9f7a93 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Mon Sep 12 13:49:53 2011 -0500 |
| committer | Jeff Hamilton <jham@android.com> | Mon Sep 12 13:50:33 2011 -0500 |
| tree | dafb6620fb0fd1971f2e0154fd3249606dff13cc | |
| parent | dd163fe4ad38d2064de2913697907e45229a8dce [diff] | |
| parent | 6900b4e2cc281db57d5e811f53a6f17eb0ebb78b [diff] |
resolved conflicts for merge of 6900b4e2 to gingerbread-plus-aosp Change-Id: I54b2b420552d876a5a39a1af7bf29436c16667a9