diff options
| author | Julius D'souza <jdsouza@google.com> | 2016-12-14 19:37:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-14 19:37:30 +0000 |
| commit | d0797e0bbdadc06cd1be9d481a09fb4de5724e9f (patch) | |
| tree | 48abbbc8fe28afbb67c80675b0aacec69251e11a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3d6b925ea2c64e1714243197c5c7183e5d637fb7 (diff) | |
| parent | 04acb73b85ba711547e0fd937ca456ff8c58fd9e (diff) | |
Merge "fix case issues with mGoingIdleWakeLock in DeviceIdleController am: e6f8cb29ec -s ours am: 7a69e8f3d8 am: af0b547fc7 am: 20081c4e71 am: 8cc9f081aa am: 1838237435 am: 7af83d0e5a" into nyc-mr2-dev-plus-aosp
am: 04acb73b85
Change-Id: I01c9a2d2339524cdf7813643945c9c7e72ab0beb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions