OSDN Git Service

(root) / android-x86 / hardware-libhardware_legacy.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1f2ef4 1aa8b4f)
Merge "[NAN] Security configuration (cipher)" am: 0f9dc48b2c am: f24303c6ec
authorEtan Cohen <etancohen@google.com>
Tue, 21 Feb 2017 18:00:40 +0000 (18:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Feb 2017 18:00:40 +0000 (18:00 +0000)
am: 1aa8b4f330

Change-Id: Ic0335cc3e2c9833c83cd3d1497fa3f03a5502b52


Trivial merge
hardware/libhardware_legacy
About OSDN
Find Software
Develop Software
Help