diff options
| author | Christoph Studer <chstuder@google.com> | 2015-01-08 18:59:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-08 18:59:45 +0000 |
| commit | 7bfbddfd5ba5afae9a9866f9453ce0b03a2f16f9 (patch) | |
| tree | af07a38345b8fb40c2a260e09c96e059d9952ccd /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | a09c49a04883cf7b771c4ff8da427f086d1dae74 (diff) | |
| parent | f5dcb6cbb9db1099e458b9a7df0a21baffbf77cc (diff) | |
am f5dcb6cb: am 9d4b7963: Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev automerge: bbadf11
* commit 'f5dcb6cbb9db1099e458b9a7df0a21baffbf77cc':
NoMan: Cancel previous instance of ignored notification
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions