diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:25:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:25:53 -0800 |
| commit | e978fed2db93d98fce576dc873afd53e6469b595 (patch) | |
| tree | bf142a0ba24a23135de5c71b3efead5868ae26b5 /AndroidManifest.xml | |
| parent | 4ea5d83539da6ab77a56415f69e9d5dbe205766a (diff) | |
| parent | 78492fe70c43432a0f1c2d88bc9133d2708f51fc (diff) | |
| download | LegacyCamera-e978fed2db93d98fce576dc873afd53e6469b595.tar.gz LegacyCamera-e978fed2db93d98fce576dc873afd53e6469b595.tar.bz2 LegacyCamera-e978fed2db93d98fce576dc873afd53e6469b595.zip | |
am 78492fe7: am 338259f2: reconcile main tree with open-source eclair
Merge commit '78492fe70c43432a0f1c2d88bc9133d2708f51fc'
* commit '78492fe70c43432a0f1c2d88bc9133d2708f51fc':
android-2.1_r1 snapshot
Diffstat (limited to 'AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions