diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-29 15:03:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 15:03:26 +0000 |
| commit | b0bdf697ca62d21353284cd2c5fcc0acd45ad52f (patch) | |
| tree | 284abf1b499e7d841792ec98d27f29bf67b0175d /rs/java/android/renderscript/ProgramStore.java | |
| parent | b0697e2ae1d5d11e89143f94225723b5365cc4e9 (diff) | |
| parent | 40359e0322822cab3b6a00f3ce30a3cf0e7d7a6f (diff) | |
am 40359e03: (-s ours) am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '40359e0322822cab3b6a00f3ce30a3cf0e7d7a6f':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions