diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-07-11 20:31:40 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-07-11 20:32:48 -0700 |
| commit | b9f691a70093f1174d07a28a8d05b436e46478b2 (patch) | |
| tree | 160907bd555a9b19d6924892f551d2a61438084f /android/AndroidManifest.xml | |
| parent | 45f36e251bb780b6276fcbe78e6ea849ec3ecc2b (diff) | |
| parent | fbaaa64a4a3cf3266b8afe62af578105ec32a374 (diff) | |
| download | subsurface-b9f691a70093f1174d07a28a8d05b436e46478b2.tar.gz | |
Merge branch 'hw-o-ble-2' of https://github.com/janmulder/subsurface
Doing a manual merge from the command line in order to retain Jan's SHAs
so that the commit message makes sense...
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'android/AndroidManifest.xml')
0 files changed, 0 insertions, 0 deletions