summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorMiao Wang <miaowang@google.com>2015-03-19 20:54:40 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-19 20:54:40 +0000
commit815bcb24b08b134dce3d7c89aacd086d3f586755 (patch)
tree8d42ef0e9a4da9b000bfe933d4776c9adbd5e08c /docs
parent4496b0a53918ac1c7bf7a87cd8553d6761f0f6e3 (diff)
parentf8a69f562b7f1c987b5eddd2ee13c04c1a787625 (diff)
downloadframeworks_base-815bcb24b08b134dce3d7c89aacd086d3f586755.zip
frameworks_base-815bcb24b08b134dce3d7c89aacd086d3f586755.tar.gz
frameworks_base-815bcb24b08b134dce3d7c89aacd086d3f586755.tar.bz2
am f8a69f56: am 2ef9955c: Merge "[RenderScript] Remove duplicate include in jni"
* commit 'f8a69f562b7f1c987b5eddd2ee13c04c1a787625': [RenderScript] Remove duplicate include in jni
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions