OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e163519 1bce9e2)
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)
* commit '1bce9e25b6979780d849096059ef73507bdda250':
  Preserve invariant that sService is not null (although NfcAdapter.get() can return null)


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help