tree 9d05f9853293bc4573587b191c45b42d9901f468
parent 163bd407492bbadcdc8f0759191e1b9142d06859
parent ddbb2c997b8462d7242b50ea1689a53122d4fce4
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