diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-03-14 17:45:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 17:45:24 +0000 |
| commit | a84b44530606fdd9ee25c90f954fa1039096df89 (patch) | |
| tree | 0570a76e9911ca3501190e8349595a9d83de1f8e /rs/java/android/renderscript/ProgramStore.java | |
| parent | 6413a7128f4915b08a56acb04f56001b499311d8 (diff) | |
| parent | f0e2988f873108ef4f03da9b6f8f5aef919ad329 (diff) | |
am f0e2988f: am d8b17079: am 6ae4d53b: resolved conflicts for merge of db3146c0 to klp-modular-dev
* commit 'f0e2988f873108ef4f03da9b6f8f5aef919ad329':
Fix power manager display wake lock bugs. (DO NOT MERGE)
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions