| commit | 2dcaaf464b86932e972aacd67bb72a3d7da6c253 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Tue Jan 25 16:02:19 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jan 25 16:02:19 2011 -0800 |
| tree | 6ef0a8feb57c4112b12022e195ae0182622cfb22 | |
| parent | 15534f4beb4e0dc89549e857235d304a34352e2c [diff] | |
| parent | 2213bb43ccfe3b6e4f45acbbd537ec8e56c9a1a4 [diff] |
Merge "resolved conflicts for merge of eb645a15 to honeycomb-plus-aosp" into honeycomb-plus-aosp