diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-02-05 14:09:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:09:38 -0800 |
| commit | 92b25666d96ffbac7959f142eb4cc3d122d1c20b (patch) | |
| tree | 2f65d36c903e92bc76b7438cb082e288918de2b7 /include/cutils | |
| parent | 157bf769be61f7d50bd1421a9be43d1ee315828b (diff) | |
| parent | d8bdf2171af548f321d417147807256e1022c89f (diff) | |
| download | system_core-92b25666d96ffbac7959f142eb4cc3d122d1c20b.tar.gz system_core-92b25666d96ffbac7959f142eb4cc3d122d1c20b.tar.bz2 system_core-92b25666d96ffbac7959f142eb4cc3d122d1c20b.zip | |
am d8bdf217: resolved conflicts for merge of e577a83a to eclair-plus-aosp
Merge commit 'd8bdf2171af548f321d417147807256e1022c89f'
* commit 'd8bdf2171af548f321d417147807256e1022c89f':
android-2.1_r1 snapshot
Diffstat (limited to 'include/cutils')
0 files changed, 0 insertions, 0 deletions