OSDN Git Service

Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7 am: 41fc794eff
authorEtan Cohen <etancohen@google.com>
Tue, 21 Mar 2017 18:08:32 +0000 (18:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 21 Mar 2017 18:08:32 +0000 (18:08 +0000)
commite58fbf0cdd7d3e890bac0cdbbb07b0a4680f65f7
treeb9f39488425dfc918c75b527985a8c62446bfbac
parenta3555590a293bbf35778b713f0fc9bf39481150a
parent79e9afe244b0561f6b4600ed8dffe2ea002e5b90
Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7 am: 41fc794eff
am: 79e9afe244

Change-Id: I1a5a77de97f8abecd182acdd64c3951d44572576