diff options
| author | Etan Cohen <etancohen@google.com> | 2016-01-15 01:29:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-15 01:29:48 +0000 |
| commit | 3da7357951a1981ecf40391e19ad8e53b45cb046 (patch) | |
| tree | cfc394e8b0a0137a3a7203827c7248c718a7cb3c /rs/java/android/renderscript/Script.java | |
| parent | f1fc5a0fe802f8cbf477b1ef54b25127818e091d (diff) | |
| parent | e540b64aaf58460f7930a5e4937cee660215c948 (diff) | |
Merge "NAN: baseline NAN manager for discovery." into mm-wireless-dev
am: e540b64aaf
* commit 'e540b64aaf58460f7930a5e4937cee660215c948':
NAN: baseline NAN manager for discovery.
Diffstat (limited to 'rs/java/android/renderscript/Script.java')
0 files changed, 0 insertions, 0 deletions