diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-02-05 08:33:35 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-02-05 08:34:30 -0800 |
| commit | d8bdf2171af548f321d417147807256e1022c89f (patch) | |
| tree | ea7390fbddedb4aea0ba47ca2bbc0ca64e99b6e9 | |
| parent | 4f4ccaa1bd079ebc67a97709bbb7ab5ada7449d5 (diff) | |
| parent | e577a83ac173dab41f550ada526de6a3cbb44b9c (diff) | |
| download | system_core-d8bdf2171af548f321d417147807256e1022c89f.tar.gz system_core-d8bdf2171af548f321d417147807256e1022c89f.tar.bz2 system_core-d8bdf2171af548f321d417147807256e1022c89f.zip | |
resolved conflicts for merge of e577a83a to eclair-plus-aosp
0 files changed, 0 insertions, 0 deletions