summaryrefslogtreecommitdiff
path: root/app/src/main/aidl/de
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-06-14 21:12:20 +0200
committercyBerta <cyberta@riseup.net>2018-06-14 21:12:20 +0200
commit452b42326167b97081bc386dbb8fd800075d1269 (patch)
treeca14573e065748fe6a2aad5a096c2d713e0c6e39 /app/src/main/aidl/de
parentdc4e74975afcba8a694ec23666c538dc761277b1 (diff)
parent117ec679f83e67762552e2c16310a1f57a9b9d88 (diff)
Merge branch 'mirror_0xacab_master' into #8889_revise_NavigationDrawer
fix merge conflict in NavigationDrawerFragment
Diffstat (limited to 'app/src/main/aidl/de')
0 files changed, 0 insertions, 0 deletions