tree 1e8115ef55cb585bb1b2bcaaae5f1ddc58a25e32
parent 610d72deb5838b4f980a4d69322ad8732f8adc37
parent d3b9dc712bf70cc85b450bd1781f34059e066881
author Nick Pelly <npelly@google.com> 1294122776 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1294122776 -0800

Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into gingerbread