Nick Pelly f0f3e98f10 DO NOT MERGE ...

Cherry-pick from GB to HC.

Update sample app for final GB MR API changes.

Change-Id: Iab3b879d1a53b70cbffd51011c77699325e21dad

2011-02-01 11:16:06 -08:00

..

assets

auto import from //depot/cupcake/@135843

2009-03-03 19:29:09 -08:00

res

Mass merge from gingerbread - do not merge

2011-01-30 12:39:58 -08:00

src/com/example/android/apis

DO NOT MERGE

2011-02-01 11:16:06 -08:00

tests

Remove use of deprecated API from test sample code.

2010-03-18 18:54:57 -07:00

_index.html

Remove unused Grid object from LabelMaker.java class.

2010-10-25 14:03:27 -07:00

Android.mk

Add ApiDemos to the test build, and cts-permission2 tests to test_defs.xml.

2009-06-19 18:34:39 -07:00

AndroidManifest.xml

am 509fbb4d: Sample code for foreground NDEF Push APIs.

2011-01-29 09:55:03 -08:00