aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values/attrs.xml
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-05-30 16:24:54 -0500
committerScott Jackson <daneren2005@gmail.com>2016-05-30 16:24:54 -0500
commit3b6f5ba72e52cade383d1d0361a4974f965ae728 (patch)
tree08fc7252f5173b22ba8971cd98de75542d462e95 /app/src/main/res/values/attrs.xml
parent403a0b8e6d0d45ffda1c32baa89c187876fa53ef (diff)
parentfb6048141ee594dc2d30a96be3150b6a94983852 (diff)
downloaddsub-3b6f5ba72e52cade383d1d0361a4974f965ae728.tar.gz
dsub-3b6f5ba72e52cade383d1d0361a4974f965ae728.tar.bz2
dsub-3b6f5ba72e52cade383d1d0361a4974f965ae728.zip
Merge remote-tracking branch 'origin/master' into playback_speed
Diffstat (limited to 'app/src/main/res/values/attrs.xml')
0 files changed, 0 insertions, 0 deletions