tree 50b5909aa76b650f9b4752d7e582889fd990eca0
parent 35dfdb6fc37cf72aab09713ce59bd8c6ec571fab
parent 14789d1eab905728da4f6995816c80716caf52f4
author Roman Nurik <romannurik@google.com> 1291074847 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291074847 -0800

am 14789d1e: Merge "Add NFCDemo to sdk.atree" into gingerbread

* commit '14789d1eab905728da4f6995816c80716caf52f4':
  Add NFCDemo to sdk.atree