diff options
author | Craig Mautner <cmautner@google.com> | 2014-02-12 22:21:56 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-12 22:21:56 +0000 |
commit | 69481d54c2c6da6ec931bb7435bddf7be1aba0af (patch) | |
tree | a702eeb283a1c3685093eb4a6d21015940e0fcdd /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 5788f2ba9b634ecc35a861d53b086bee1384d0b0 (diff) | |
parent | 8dfda07dd410c1776c6b0d373229fe77c76f8cfc (diff) |
am 8dfda07d: am 731c30c1: Merge "Don\'t add windows from exiting app tokens twice." into klp-modular-dev
* commit '8dfda07dd410c1776c6b0d373229fe77c76f8cfc':
Don't add windows from exiting app tokens twice.
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions