| commit | b2d0ee164a1cf7bab31302c5d3cdd62322574271 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu May 19 12:48:41 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu May 19 12:48:41 2011 -0700 |
| tree | a7497be969341f08ffca5418831ff4ad6a0db7c0 | |
| parent | 09ded82b784b9f6e01d4cd4298097fd2b459560b [diff] | |
| parent | e6cd0c747e76723bc51a23925c239ae10f9d3b5c [diff] |
Merge "resolved conflicts for merge of 2433c443 to honeycomb-plus-aosp" into honeycomb-plus-aosp