| commit | 81363d359fda76cb40da77ccdc79e7e7e41a2d88 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Thu Feb 10 13:47:32 2011 -0800 |
| committer | Scott Main <smain@google.com> | Thu Feb 10 13:47:32 2011 -0800 |
| tree | ea8394774dd2af9d10699c0198d5639d47f212a6 | |
| parent | b91f20af989649dd04652e95a9cfb9f85f4e7086 [diff] | |
| parent | a12ed5ec38a739d8486112ae7f3e7b2ca3fb77a7 [diff] |
resolved conflicts for merge of 42f18194 to honeycomb-plus-aosp Change-Id: I42c36e828f5b28d84f2062bfd4963711251696b7