diff options
| author | Nick Kralevich <nnk@google.com> | 2015-07-24 03:07:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:07:45 +0000 |
| commit | a8937f13f8ae17a29ce56a804a67c7e6560d232b (patch) | |
| tree | 30d3cb6c6242760f586e517ad98c5617d35d8a54 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 675ecc43d6e0294d1c87eab37d343ab4e02492a2 (diff) | |
| parent | a2adb4c5441a541581db64d8f027b65033241111 (diff) | |
am a2adb4c5: am 06b93a48: Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev
* commit 'a2adb4c5441a541581db64d8f027b65033241111':
Revert "UsbDeviceManager: fix b/21429947 regression"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions