diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-22 16:32:34 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-11-22 16:32:34 -0800 |
| commit | 8484e57f3006dd3aa925792e6414387c233c1a8d (patch) | |
| tree | 99abad315a9d51f33c54b6ca961c88fed096cc75 /include | |
| parent | 6bdd69370fe2bda7adc7055f62165fccd944b192 (diff) | |
| parent | e4ae7fc3eb6776881d1707483d3f0c93443040d4 (diff) | |
| download | frameworks_base-8484e57f3006dd3aa925792e6414387c233c1a8d.zip frameworks_base-8484e57f3006dd3aa925792e6414387c233c1a8d.tar.gz frameworks_base-8484e57f3006dd3aa925792e6414387c233c1a8d.tar.bz2 | |
resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp
Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions