summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRomain Guy <romainguy@google.com>2013-03-19 02:37:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-19 02:37:23 +0000
commit3c122050903dfb91ed49c2f0fb2affb93b3c4bb2 (patch)
tree265b4399040b4bc704ae6f35852cc28a7c29c723 /core
parentaf216f7ce714a3e7b93288bdf7a9273d0c301b35 (diff)
parent595b5bdf08ab315898b4af0c5c7033a912e004f7 (diff)
downloadframeworks_base-3c122050903dfb91ed49c2f0fb2affb93b3c4bb2.zip
frameworks_base-3c122050903dfb91ed49c2f0fb2affb93b3c4bb2.tar.gz
frameworks_base-3c122050903dfb91ed49c2f0fb2affb93b3c4bb2.tar.bz2
am 595b5bdf: am 603ce559: Merge "Apply ComposeShader\'s local matrix to children" into jb-mr2-dev
* commit '595b5bdf08ab315898b4af0c5c7033a912e004f7': Apply ComposeShader's local matrix to children
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions