| commit | adb8c2f970fb9436fa2b7f515e51efcc878ce4e6 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Tue Jan 25 16:29:48 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 25 16:29:48 2011 -0800 |
| tree | 47e45e1df39282148bf87ae9316c8769a7d7d345 | |
| parent | a497e9448ef2e52db28ba0c400ae3b94ac1b6fc4 [diff] | |
| parent | 4405cdbfffdf5f927f03e14d6e78ea2a11e42893 [diff] |
Merge "resolved conflicts for merge of f0b7977f to honeycomb-plus-aosp" into honeycomb-plus-aosp