diff options
| author | Selim Cinek <cinek@google.com> | 2015-07-25 15:54:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-25 15:54:54 +0000 |
| commit | 756d5ac2ed7bba9f4d2e7c95a627b0e449ef5334 (patch) | |
| tree | ecad40e5fd77ba9df09ae260efedd912c2e7dfdc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5b65bb1bc75ace94918690553993cf356014525e (diff) | |
| parent | e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029 (diff) | |
am e0c0e93a: am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev
* commit 'e0c0e93a0f4582fca58733be7a4b1d7a6e6e8029':
Fixed wake to unlock when the device has never been unlocked
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions