| commit | 815bcb24b08b134dce3d7c89aacd086d3f586755 | [log] [tgz] |
|---|---|---|
| author | Miao Wang <miaowang@google.com> | Thu Mar 19 20:54:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 19 20:54:40 2015 +0000 |
| tree | 8d42ef0e9a4da9b000bfe933d4776c9adbd5e08c | |
| parent | 4496b0a53918ac1c7bf7a87cd8553d6761f0f6e3 [diff] | |
| parent | f8a69f562b7f1c987b5eddd2ee13c04c1a787625 [diff] |
am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni" * commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625': [RenderScript] Remove duplicate include in jni