diff options
| author | Justin Koh <justinkoh@google.com> | 2014-10-02 08:50:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 08:50:27 +0000 |
| commit | f7aac12e1bc766a4357ca29d2f248eef265097f8 (patch) | |
| tree | baebddb5d6824ad36e966f36c244b0a75b70bce4 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | c152c7aad6ece42d101aede8efe9cdb5ea3f5a3c (diff) | |
| parent | bf6f081cda7360810645cf6bf932687df1cfae00 (diff) | |
am bf6f081c: (-s ours) am 37185d90: Merge "DO NOT MERGE Hide the volume panel for watches for now" into klp-modular-dev
* commit 'bf6f081cda7360810645cf6bf932687df1cfae00':
DO NOT MERGE Hide the volume panel for watches for now
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions