| commit | e121cd7408841b9aa776c3c11071043d9e5ab652 | [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 | aa30a4379194cdb17d0ba95405b471499b23bcb2 | |
| parent | 13b37b896b1d0c95a19250c28f6966f87db220d7 [diff] | |
| parent | 5403b2a82d3f76299bd077c759a5827d2e0322a7 [diff] |
Merge "resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp" into honeycomb-plus-aosp