diff options
| author | Etan Cohen <etancohen@google.com> | 2016-01-15 01:17:08 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2016-01-15 01:17:08 +0000 |
| commit | e540b64aaf58460f7930a5e4937cee660215c948 (patch) | |
| tree | 3d5104ec0a5eb5a14329d7c1541102d913940dd8 /rs/java/android/renderscript/Script.java | |
| parent | 49442a1dd7bbf15e6014e88d8143f198a43bad05 (diff) | |
| parent | 20d329b08df7d1a94e6caee781f09e812a79c913 (diff) | |
Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions