diff options
| author | Mahaver Chopra <mahaver@google.com> | 2016-05-24 12:30:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-24 12:30:44 +0000 |
| commit | 4545f9138e765b127c5d9b2e9eb24b074a4850fa (patch) | |
| tree | 3ca251ce5c2e1e8e99a0ebac13d08742faf8ee68 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f076687f67596f8866cb8b5e2f2a14ad22b22fda (diff) | |
| parent | dd86aa141e02ffaf277996fc1701141ea13e090e (diff) | |
Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev
am: dd86aa141e
* commit 'dd86aa141e02ffaf277996fc1701141ea13e090e':
Disallow OEM unlock when DISALLOW_FACTORY_RESET applies
Change-Id: I077fd5c067c453a4dcd161ba582e473ade1a8392
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions