diff options
| author | Colin Cross <ccross@google.com> | 2015-07-23 19:25:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-23 19:25:47 +0000 |
| commit | 353e6a1b8ca37608d2073632b76578a21243b167 (patch) | |
| tree | 754c98f0002bcba3b1227143bedabeef72c9d6eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 08a38b68e9979dd855026394ccc67f7eed0dbd85 (diff) | |
| parent | a083ef9a7b882a249928ed928adf6af61a525e37 (diff) | |
am a083ef9a: am bbcc914b: am 01efd7e8: Merge "Use build_number from file"
* commit 'a083ef9a7b882a249928ed928adf6af61a525e37':
Use build_number from file
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions