diff options
| author | Nick Kralevich <nnk@google.com> | 2015-07-23 19:20:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:20:05 +0000 |
| commit | a2adb4c5441a541581db64d8f027b65033241111 (patch) | |
| tree | 17b798c087ff0621f44599c2e3b8cefef5ae19ad /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5974a7ea2fcc11b994599bdd2c9e2b4c8bbdaf56 (diff) | |
| parent | 06b93a48ad0d2274ff41683e08b8a1429045b0a9 (diff) | |
am 06b93a48: Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev
* commit '06b93a48ad0d2274ff41683e08b8a1429045b0a9':
Revert "UsbDeviceManager: fix b/21429947 regression"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions