diff options
| author | Scott Main <smain@google.com> | 2010-11-10 15:10:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-10 15:10:13 -0800 |
| commit | 0996daa748083507f276617b1fb739414c594ae6 (patch) | |
| tree | ab1f9a1e8c342b1a6d6e46c4ca5d4ee584a5f974 /include | |
| parent | 182e2d25cfdf69a35aa6401a91b0d4892447ec72 (diff) | |
| parent | d4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2 (diff) | |
| download | frameworks_base-0996daa748083507f276617b1fb739414c594ae6.zip frameworks_base-0996daa748083507f276617b1fb739414c594ae6.tar.gz frameworks_base-0996daa748083507f276617b1fb739414c594ae6.tar.bz2 | |
am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
* commit 'd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2':
docs: remove "new" tags from sample apps
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions