summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2015-06-02 23:16:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-02 23:16:31 +0000
commit6058251939e417ed764d76fbde77eefc964d0ee6 (patch)
treeec5b7b222d704227a23e05ad45fa5d8107a32923 /rs
parent4e14da5695b5457ae7da53c7f3079c71e37b2e19 (diff)
parentbf3c602284f9a344faf185c3a5e94a264ba44c4f (diff)
downloadframeworks_base-6058251939e417ed764d76fbde77eefc964d0ee6.zip
frameworks_base-6058251939e417ed764d76fbde77eefc964d0ee6.tar.gz
frameworks_base-6058251939e417ed764d76fbde77eefc964d0ee6.tar.bz2
Merge "More colors, now with material colors" into mnc-dev
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions