commit | 4611bb1814afc7dcc3177cbb248bfb5ee1662ba0 | [log] [tgz] |
---|---|---|
author | Nick Pelly <npelly@google.com> | Fri Oct 29 08:20:28 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 29 08:20:28 2010 -0700 |
tree | 7e1817b0a5e1f0e4cf91ea43721d3eb2ec384ac4 | |
parent | 6e9f6d1e037139d2ef106b03b8f27248764169d8 [diff] | |
parent | ba1664b34cc33ebb6b45fccedb35298ff8b1d998 [diff] |
am ba1664b3: am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread * commit 'ba1664b34cc33ebb6b45fccedb35298ff8b1d998': Hide some NFC API's.