diff options
| author | Etan Cohen <etancohen@google.com> | 2016-10-06 02:21:04 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-06 02:21:04 +0000 |
| commit | 95fad688c31121aa100d6092531a3bd6c69eb05d (patch) | |
| tree | 032e4a6781ff246c05ce596b5c17b2ce491f2c01 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 4d855f15abb49085ce5b2794e63e684fd32f5db3 (diff) | |
| parent | 97b3d99577fdaf470d20632b7b2a8a49ced816da (diff) | |
Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d am: c5101c52b6
am: 97b3d99577
Change-Id: Ie9eeeb5b5a898a8b147628d8aacf1e365fa6e91a
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions