| commit | 7d259626d009a45195ec341646ce06658b842e40 | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Tue Jun 07 15:01:50 2011 -0700 |
| committer | Jake Hamby <jhamby@google.com> | Tue Jun 07 15:01:50 2011 -0700 |
| tree | 02da93e139a4e8ff65aa8957f2a1565f1f88fe2f | |
| parent | 752a5b3df55da655792d382025171d94073e05f9 [diff] | |
| parent | 0cb17a52ee278e6fd1575a086dac155e11574287 [diff] |
resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp Change-Id: I784e6d1946fa708f63becece070c7090cec6f1e2