diff options
| author | John Reck <jreck@google.com> | 2011-05-18 09:03:36 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-05-18 09:03:36 -0700 |
| commit | fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01 (patch) | |
| tree | fcab178478150890e8a7403ca0ab91e722b4851a /tests | |
| parent | 9320ab5b395e2c47514e94dc4a8db7cb5dc8d66d (diff) | |
| parent | e619f1e55fe312b5b4ad451e56dd12f73ea66a49 (diff) | |
| download | android_packages_apps_Gello-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.tar.gz android_packages_apps_Gello-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.tar.bz2 android_packages_apps_Gello-fba541e7ca1ae088bf612d2d98fe4ce60b7c1e01.zip | |
resolved conflicts for merge of e619f1e5 to master
Change-Id: I04de9e92a91cd66e848d37cbb07f7d36a4edba06
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions