summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-08-26 15:13:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-26 15:13:50 +0000
commit7dd9776fa82ff86d4086a3ba61b57f0db00ae560 (patch)
tree4e3922691768d1df9dd469505a634c92e5e304db /rs
parent2ab2c3935c0a3154a043b03c2eb77aa8acda95f3 (diff)
parentb1d0ef5356856a1ed2390ec253be69e8a3df60a3 (diff)
downloadframeworks_base-7dd9776fa82ff86d4086a3ba61b57f0db00ae560.zip
frameworks_base-7dd9776fa82ff86d4086a3ba61b57f0db00ae560.tar.gz
frameworks_base-7dd9776fa82ff86d4086a3ba61b57f0db00ae560.tar.bz2
am d73a1aa3: am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev
* commit 'd73a1aa3b97d9cd9792dec4a58ab6150b76afb31': DO NOT MERGE Copy shaders
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions