diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-25 13:34:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 13:34:55 +0000 |
| commit | 7b1ccf87002305a6568da318a8dac11ed5dfd247 (patch) | |
| tree | 75800b834d36f37fc479b05369b8b415335a3fce /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9b4a83bf07cb468c07dbf3db486cd4aa44df8988 (diff) | |
| parent | b5e25925828dd5a23eaa2ea3a4cebcc6652d2762 (diff) | |
Merge "Hide work profile key in user credentials screen am: d398244513 am: ed39b3b166" into nyc-mr1-dev-plus-aosp
am: b5e2592582
* commit 'b5e25925828dd5a23eaa2ea3a4cebcc6652d2762':
Hide work profile key in user credentials screen
Change-Id: Ie10f57378d3cf1168a9200bf02f3b46d2d1bfe4b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions