OSDN Git Service

am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (althou...
authorNick Pelly <npelly@google.com>
Fri, 15 Jul 2011 17:47:10 +0000 (10:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 Jul 2011 17:47:10 +0000 (10:47 -0700)
commitfc00b2ed4fa64621015b47310b91e937581bd3a3
treee2b2f732df725c38ae33a5137c58a8c4824fbd37
parente1635197bb6e6471b333d194855bb399da419957
parent1bce9e25b6979780d849096059ef73507bdda250
am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread

* commit '1bce9e25b6979780d849096059ef73507bdda250':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)