tree f9e8441c3b0216ce0af144f3c9edbd0d7f43ca30
parent 085996210ccc84cf3cdebdcf75b6dfdc6e0b7ec5
author Nick Pelly <npelly@google.com> 1286241717 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1286241717 -0700

Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread