diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-10-02 08:50:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 08:50:43 +0000 |
| commit | 42099d45c3f39989c9c4ec1a5f67206f9c23342b (patch) | |
| tree | baebddb5d6824ad36e966f36c244b0a75b70bce4 /rs/java/android/renderscript/Program.java | |
| parent | b183c1812b76411161e9f71a313d2f6384ab9162 (diff) | |
| parent | ddbd9bec76036fb2ce9f1cd1b7ccb70bd859a1a5 (diff) | |
am ddbd9bec: (-s ours) am 2d77fad2: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev
* commit 'ddbd9bec76036fb2ce9f1cd1b7ccb70bd859a1a5':
Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions