OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cba75f3 cb47762)
am cb477625: am e386f7f5: Merge "Expose peer LLCP version in NDEF callbacks."
authorMartijn Coenen <maco@google.com>
Fri, 17 Apr 2015 07:37:47 +0000 (07:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Apr 2015 07:37:47 +0000 (07:37 +0000)
* commit 'cb4776254c92e4b8c05e2bd60e730aa76b55358f':
  Expose peer LLCP version in NDEF callbacks.


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