Merge remote-tracking branch 'remotes/upstream/video_thumbnail' into beta
[pub/Android/ownCloud.git] / libs / android-support-appcompat-v7-exploded-aar / res / values-v21 / values-v21.xml
2015-12-02 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/video_th...
2015-12-02 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/avoidDup...
2015-12-02 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/material...
2015-12-02 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-30 Andy ScherzingerMerge branch 'avoidDuplicateFiles' of https://github...
2015-11-29 tobiasKaminskyMerge remote-tracking branch 'remotes/upstream/master...
2015-11-29 tobiasKaminskyMerge branch 'beta' of github.com:owncloud/android...
2015-11-28 Andy ScherzingerMerge branch 'target_marshmallow' of https://github...
2015-11-28 Andy Scherzingermarshmallow changes redone