| commit | 796539b12ad0d02b722de056d2c5f791fcfc3403 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Jun 20 12:15:24 2011 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Mon Jun 20 12:15:24 2011 -0700 |
| tree | 6f5c044edbf9ef5bdb033867c47d96c640329bb5 | |
| parent | 00ca322d5d99056b47a74075e2d2c8b464bbdbc1 [diff] | |
| parent | 33cdcdf2fac67a336d64baaf412522488618bac1 [diff] |
resolved conflicts for merge of b427f0e6 to honeycomb-plus-aosp Change-Id: I8e287fd814b4a3ca72014ea060a1de043d1b4713