diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2014-05-23 00:11:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 00:11:04 +0000 |
| commit | c877f6ab11e02394ca79aba7976ddaa9d8aca56c (patch) | |
| tree | 72bc6fe950898174e6dc005505b02fba4be185d5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 8b15da393a75b84ff36df2dd5d7d305add0534d7 (diff) | |
| parent | 7d16bb1e32fc61f3f26e72b8a36fb332073ead75 (diff) | |
am 95b404dc: (-s ours) DO NOT MERGE Move clock and top padding while dismissing Keyguard.
* commit '95b404dc1f0c4f74824de401537d51e73d84e6e8':
DO NOT MERGE Move clock and top padding while dismissing Keyguard.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions