diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-25 10:42:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 10:42:38 -0700 |
| commit | 550b44d1884c5f65187dbc8bf8d4e6090f302a7b (patch) | |
| tree | 76cf5eaef828bff67f76eb07a2d5bd57f6bf82db /rs/java/android/renderscript/RenderScriptGL.java | |
| parent | 5035faba9a28f988291c4ff3d3cbf64d828f3f5a (diff) | |
| parent | f4644189f665f221e8033587811e58f12e2ccc86 (diff) | |
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 'f4644189f665f221e8033587811e58f12e2ccc86':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptGL.java')
0 files changed, 0 insertions, 0 deletions