OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bea90f6 a96c6e2)
Merge "[NAN] Use a hidden class for peer ID opaque handle" am: e43c1a3e3e am: 66741c2c0f
authorEtan Cohen <etancohen@google.com>
Wed, 28 Sep 2016 05:25:52 +0000 (05:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 05:25:52 +0000 (05:25 +0000)
am: a96c6e222b

Change-Id: I2bb9a0eb5040d0dd37ec2ffda5fa06bde9ee6a50


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