OSDN Git Service

am 26eeedce: am b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extra...
authorNick Pelly <npelly@google.com>
Tue, 15 Nov 2011 19:30:22 +0000 (11:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Nov 2011 19:30:22 +0000 (11:30 -0800)
commit2cb8b5d9e98d8d9696cdb0640e47c40ac7bc53f7
tree57ee48cba3013231cdb9e77ea5c1fe6311d72799
parent187309bdcc366eee4e8fcbb472d330580760b3cc
parent26eeedceb12fa4d293f6e987115f0e2de54947b8
am 26eeedce: am b3b66af2: Merge "Move nfc-extras tests into frameworks/base/nfc-extras/tests." into ics-mr1

* commit '26eeedceb12fa4d293f6e987115f0e2de54947b8':
  Move nfc-extras tests into frameworks/base/nfc-extras/tests.