tree ca00a2bb808c6e16d40b50b7d99dc55a844494cf
parent eaed213c023a1f918cd98efd3bb847964277307d
parent 980baf1bd79ff3ff8cdac3dd929f1b31bb174917
author Etan Cohen <etancohen@google.com> 1490119263 +0000
committer android-build-merger <android-build-merger@google.com> 1490119263 +0000

Merge "[AWARE]: Fix Nan capabilities mismatch"
am: 980baf1bd7

Change-Id: I01b2d62e40d25be61463ca93ea2153ce086a2be3