OSDN Git Service

Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7
authorEtan Cohen <etancohen@google.com>
Tue, 21 Mar 2017 18:04:33 +0000 (18:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Mar 2017 18:04:33 +0000 (18:04 +0000)
commit79e9afe244b0561f6b4600ed8dffe2ea002e5b90
treeca00a2bb808c6e16d40b50b7d99dc55a844494cf
parent93dea20a32cbca10f83333d9ca8662dafa66abfa
parent41fc794eff876dd19a47a945bddd856ea2c849a3
Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7
am: 41fc794eff

Change-Id: I6320d1e6a82f26d3cc60a5c80c71e2ec17aa9ce7