diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-06-15 01:26:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-15 01:26:34 +0000 |
| commit | aee4d8a058daefe6edfa4541aa90df06aba49042 (patch) | |
| tree | 649f53fd818af7af467c5b17135143ceb39cb494 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ab26de73b0d895024f827d220055c1cdaa7d5897 (diff) | |
| parent | 6d7a949eec859428427610d02f7c802e7d1d26df (diff) | |
Merge "Merge \\"Allow apps with CREATE_USERS permission to call UM.getUserInfo.\\" into nyc-dev am: 159c13801b am: 5df969f778" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions