diff options
| author | Craig Mautner <cmautner@google.com> | 2014-03-25 17:48:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 17:48:38 +0000 |
| commit | 6f955df8e632aabeef312d488b7ebbad25d8a2d8 (patch) | |
| tree | 018e15a5a9cc69cd634565ac06f1293995618e10 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2b2395f39a7a3b271f7d1072acec64db1554694e (diff) | |
| parent | 550b44d1884c5f65187dbc8bf8d4e6090f302a7b (diff) | |
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 '550b44d1884c5f65187dbc8bf8d4e6090f302a7b':
Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions