commit | 0091091a3c08d20ff8ffc0911265b41b87bf0921 | [log] [tgz] |
---|---|---|
author | Jeff Hamilton <jham@android.com> | Sun Jan 09 19:04:15 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jan 09 19:04:15 2011 -0800 |
tree | 8049338909bcd47eac87c0b3c036ccf8ae37c7b7 | |
parent | 73d7779e2ee7d59cf07067649fbaecb4089cf363 [diff] | |
parent | e3db3d6209c234e032775079a1e1489478dabf86 [diff] |
am e3db3d62: Merge commit \'525f953b\' into manualmerge * commit 'e3db3d6209c234e032775079a1e1489478dabf86': Make the new NFC APIs public.