summaryrefslogtreecommitdiffstats
path: root/src/android
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-09-17 20:57:50 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-09-17 20:57:50 +0200
commita72d34d26e6a02b9d836a9a3ade3d97930818fe6 (patch)
tree63448fc192275fa107c7cd4ca6957df1688b656a /src/android
parente409eafe23c8f90a01ed198090c2d7df0d07e708 (diff)
parent209a75f2d071e0977b6c0a8a2ce5d6eb0ff95b8c (diff)
Merge remote-tracking branch 'origin/5.3.2' into 5.3
Diffstat (limited to 'src/android')
0 files changed, 0 insertions, 0 deletions