diff options
| author | The Android Automerger <android-build-merger@google.com> | 2017-07-19 00:27:08 +0000 |
|---|---|---|
| committer | The Android Automerger <android-build-merger@google.com> | 2017-07-19 00:27:08 +0000 |
| commit | af11a49d8c2952b7d40611340b8fc4381601920d (patch) | |
| tree | 6388ef8840994b6ccef70c63931c9cd99c4178ca /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d480015b602c6d1d7c1ac99920944b1e3a73c1e0 (diff) | |
| parent | 530b93aae428bf528ac1d2c0b69c179478f0622a (diff) | |
Manually merge commit '530b93aae428'
* commit '530b93aae428':
NetworkCapabilities: Unhide TRANSPORT_LOWPAN
BUG:31038431
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions