diff options
| author | Ricky Wai <rickywai@google.com> | 2016-05-25 13:36:10 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 13:36:10 +0000 |
| commit | 71b04e6ac227625060cbe958b3b0cf18aff24853 (patch) | |
| tree | 75800b834d36f37fc479b05369b8b415335a3fce /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7b1ccf87002305a6568da318a8dac11ed5dfd247 (diff) | |
| parent | ba6f173c7c58dccc5c183f8e5ce7eb2dd4663b57 (diff) | |
Merge "Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd am: fdf928d4b5" into nyc-mr1-dev-plus-aosp
am: ba6f173c7c
* commit 'ba6f173c7c58dccc5c183f8e5ce7eb2dd4663b57':
Change-Id: I4375084e3c25e6c4e5fbfce20e3bf826b076ec81
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions