diff options
author | Dan Albert <danalbert@google.com> | 2015-04-09 18:31:38 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-09 18:31:38 +0000 |
commit | e24d36b7b744540ccd3401609248ed9d48be4cc9 (patch) | |
tree | 49d63fb8c960664c5fb8ae3a0c88edda2d57c4bb /rs/java/android/renderscript/RenderScript.java | |
parent | acae606f5dde5fff990ffc840da89fcc61f03c5b (diff) | |
parent | 1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea (diff) |
am 1f799a6b: am d9f32b16: Merge "Ensure alignment of Res_png_9patch."
* commit '1f799a6b96eaa74a776bc2d1b3d52b937dd1a9ea':
Ensure alignment of Res_png_9patch.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions