diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-25 13:27:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 13:27:20 +0000 |
| commit | bacc1d40ac96cab4a749bb3354f915f7d0771b08 (patch) | |
| tree | 6a1485e930f4ab25a913ef5635c60b187c2abec7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d41790c16f3bfdad683e8dc8e512465301cbdfec (diff) | |
| parent | 454bb8d526d998060d56c84b34e7a345ce7fa44d (diff) | |
Merge "Do not tie managed profile synchronously in onUnlockUser()" into nyc-dev am: 99df649aa4 am: 88986c8887
am: 454bb8d526
* commit '454bb8d526d998060d56c84b34e7a345ce7fa44d':
Change-Id: I06c6757b85e21dcf1973a317e47d81861b891abc
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions