diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 09:53:43 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 09:53:43 -0700 |
| commit | 09f1e2b2151ea18c05b9138a0a5cb63af18ea373 (patch) | |
| tree | a8867b197b5f31b9fc3d59dc724ffc9f1e43f3b3 /docs | |
| parent | 94db0238a3b6cba3cbf0e037af74e898a4741204 (diff) | |
| parent | 56aa3c761d4e8c618151e92135706838abd84a6c (diff) | |
| download | frameworks_base-09f1e2b2151ea18c05b9138a0a5cb63af18ea373.zip frameworks_base-09f1e2b2151ea18c05b9138a0a5cb63af18ea373.tar.gz frameworks_base-09f1e2b2151ea18c05b9138a0a5cb63af18ea373.tar.bz2 | |
resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp
Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions