diff options
author | Jim Miller <jaggies@google.com> | 2014-08-15 01:01:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-12 23:14:48 +0000 |
commit | 989b68e82d7512940a3c7c19c5919e47def8e556 (patch) | |
tree | bde435881898f839dadae5115d202e92bb579abc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 27f116195c478e2364012fd6d391cf8c8bf39a88 (diff) | |
parent | 66093a9024a0ad88cb9c629457b9d8118071ae74 (diff) |
Merge changes I77f49fe8,I305e927a into lmp-dev
* changes:
API review - move confirm credential constants from Intent
Revert "Add new intent to prompt user for their device credential."
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions