| commit | fa213d82a99531f4941795f060ce2b7d1ae739a6 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue Sep 21 10:30:13 2010 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 21 10:30:13 2010 -0700 |
| tree | 5199173a602d256a8bff8431d88a61bfd4431e5e | |
| parent | a86c1a622fb61d8157dac9ef3d66084a6ac2f0e0 [diff] | |
| parent | 4524c6244884d4b3aff0b6b00372427b6a42ebd8 [diff] |
Merge "resolved conflicts for merge of 749e6bc5 to master"