summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2015-04-29 23:53:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-29 23:53:19 +0000
commit0f1a3972c18371359c39e6789607621bf0989181 (patch)
tree630b0003ed303b007c153054bde6fa6be68631ec /rs
parent8cc1d3dba4e06c47669c5b0c0d12b24ba70cd57a (diff)
parentf601440e21f352f5e59dd27e6709c7137cd90090 (diff)
downloadframeworks_base-0f1a3972c18371359c39e6789607621bf0989181.zip
frameworks_base-0f1a3972c18371359c39e6789607621bf0989181.tar.gz
frameworks_base-0f1a3972c18371359c39e6789607621bf0989181.tar.bz2
Merge "Stash modulation alpha until ColorStateList has resolved base color" into mnc-dev
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions