diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-08-25 22:05:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-25 22:05:23 +0000 |
| commit | 5776ad9e404c72d49a204cb087483ffb9c8eca25 (patch) | |
| tree | 573d583815cdfb80e4fed3085f1a5deddc3f63f4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9a224d4aba0f02c8aab7f6d773599b3d85dd96e5 (diff) | |
| parent | dfd3bceaef4b93368c1c9dce334ca1b73fa98866 (diff) | |
Merge "Merge "Remove PIN/PUK keyguard when SIM is removed/ready" into oc-mr1-dev am: 9938901bbc" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions