diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-30 13:56:48 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-30 13:56:48 -0700 |
| commit | bb1d8e42dddcc89422b7add4b250d016d332bba8 (patch) | |
| tree | 03ece62a81f0a648f84fa73d7bd64b0f91fa6070 | |
| parent | 4692599cf73240e34d8e3bf7f54e99ebb9c0aaf3 (diff) | |
| parent | 9682e24bae0539babbcd3f33b8e310e6a6427a44 (diff) | |
| download | system_core-bb1d8e42dddcc89422b7add4b250d016d332bba8.zip system_core-bb1d8e42dddcc89422b7add4b250d016d332bba8.tar.gz system_core-bb1d8e42dddcc89422b7add4b250d016d332bba8.tar.bz2 | |
resolved conflicts for merge of 9682e24b to gingerbread-plus-aosp
Change-Id: I8cd7e43ee9689bc5c86ed0976536ef5235cbfd84
0 files changed, 0 insertions, 0 deletions