| commit | 7ca13deb40ac60b88abc1d752871b124afea9169 | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Tue Jun 07 15:03:51 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 07 15:03:51 2011 -0700 |
| tree | 1504c636e3a8f73a206d66ca0b787ab21692d2d8 | |
| parent | c8c39b6c5b14bbe17fbd0ffe4f3524f68a0caa10 [diff] | |
| parent | 7d259626d009a45195ec341646ce06658b842e40 [diff] |
Merge "resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp" into honeycomb-plus-aosp