diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-25 21:23:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 21:23:41 +0000 |
| commit | c9ef91a72f4c473d425b522c02ad74550f80b6da (patch) | |
| tree | 1a7085ffa4ca62f473b321ca1b8b607deafa6b03 /rs/java/android/renderscript/ProgramStore.java | |
| parent | 9a07a66ba9b159be465ca120296deaf4a31b369c (diff) | |
| parent | f07788b997e31578da202525ac72d4eec6fe4176 (diff) | |
am f07788b9: am c89283c5: am d0955068: am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev
* commit 'f07788b997e31578da202525ac72d4eec6fe4176':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions