summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2011-01-03 22:35:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-01-03 22:35:49 -0800
commitf75645f66df542cd557199bc4c516a3e55d22860 (patch)
treebc367a5d181b3d6c09c9acfb932083ae0ab74ad7
parent775997cf4d5a7a523202f2a7e60ad9a78b3d3ac0 (diff)
parentddf6027ea375bef0b4423dcfa10264e06d39b002 (diff)
downloadframeworks_native-f75645f66df542cd557199bc4c516a3e55d22860.zip
frameworks_native-f75645f66df542cd557199bc4c516a3e55d22860.tar.gz
frameworks_native-f75645f66df542cd557199bc4c516a3e55d22860.tar.bz2
am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread
* commit 'a743448a1b34d950b1e6f06e308ce113cbc9abcb': Tweak Ndef.getType() API. Rename constants, expand javadoc.
0 files changed, 0 insertions, 0 deletions