diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-05 18:08:16 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-12-05 18:08:16 -0800 |
| commit | 3d524e562606e7994ede3429b37937f40f94cd41 (patch) | |
| tree | 81b48587b26fa81ac70699366e4b4cbff040a40a /core/res/AndroidManifest.xml | |
| parent | d8c323321c28a0a5ff70c6e0694aa822edca4005 (diff) | |
| parent | 2fe24e3e14cce791e89c93ddc23e28af5c2c90cc (diff) | |
| download | frameworks_base-3d524e562606e7994ede3429b37937f40f94cd41.zip frameworks_base-3d524e562606e7994ede3429b37937f40f94cd41.tar.gz frameworks_base-3d524e562606e7994ede3429b37937f40f94cd41.tar.bz2 | |
Merge gingerbread-nfc into gingerbread
Diffstat (limited to 'core/res/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions