OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6e91196 78c2ee5)
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery [DO NOT MERGE...
authorEtan Cohen <etancohen@google.com>
Wed, 5 Oct 2016 22:32:09 +0000 (22:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Oct 2016 22:32:09 +0000 (22:32 +0000)
am: 78c2ee57f9  -s ours

Change-Id: Ic0a353bfd0e7cff20de69e29ca8ff43265c3b93b


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