diff options
| author | Baligh Uddin <baligh@google.com> | 2013-12-05 21:30:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-05 21:30:08 +0000 |
| commit | d22f6a6296b0fc7dee08bc442a54343c1b478a4c (patch) | |
| tree | a4f6093c1594b8a53778e964599baa3565664215 /rs/java/android/renderscript/Program.java | |
| parent | 4830bc50848e3c575e74ef9c996821af45943cf7 (diff) | |
| parent | 61c9706bac583a1cf95be12d7f5e96f652669d72 (diff) | |
am 61c9706b: (-s ours) am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '61c9706bac583a1cf95be12d7f5e96f652669d72':
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions