| commit | 41fc794eff876dd19a47a945bddd856ea2c849a3 | [log] [tgz] |
|---|---|---|
| author | Etan Cohen <etancohen@google.com> | Tue Mar 21 18:01:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Mar 21 18:01:03 2017 +0000 |
| tree | ca00a2bb808c6e16d40b50b7d99dc55a844494cf | |
| parent | eaed213c023a1f918cd98efd3bb847964277307d [diff] | |
| parent | 980baf1bd79ff3ff8cdac3dd929f1b31bb174917 [diff] |
Merge "[AWARE]: Fix Nan capabilities mismatch" am: 980baf1bd7 Change-Id: I01b2d62e40d25be61463ca93ea2153ce086a2be3