Files
android_development/samples/NotePad/AndroidManifest.xml
Raphael ba068ce356 resolved conflicts for merge of 0aa38562 to master
Change-Id: I2e79f7c906477bc5d02352de6a7be17fffb4730a
2010-11-23 02:57:16 -08:00

6.0 KiB