diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-04-29 10:16:56 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-04-29 10:16:56 -0700 |
| commit | 80665e81bec1bee22b1d93d287aa0ca0e23d0079 (patch) | |
| tree | af24b87f5188bb08ccd93a0ed6b1113b87b95ab9 /app/src/main/res/layout/preferences.xml | |
| parent | 0f801b780e82943bde5b3e7d96af1c6b29ba4edc (diff) | |
| parent | 076d07c655656b6d8bc3e5e3f4e2f8aa3747dd2d (diff) | |
| download | dsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.tar.gz dsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.tar.bz2 dsub-80665e81bec1bee22b1d93d287aa0ca0e23d0079.zip | |
Merge branch 'master' into SlideUpPanel2
Conflicts:
app/app.iml
app/build.gradle
Diffstat (limited to 'app/src/main/res/layout/preferences.xml')
0 files changed, 0 insertions, 0 deletions