diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:53 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:23:53 +0200 |
commit | 33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8 (patch) | |
tree | e5395820cc8a1f66fb42d8e4f4757420ea5e9661 /src/plugins/sensors/android/src/androidpressure.h | |
parent | f8e256271f919c36c8d97eae27b1d11678294e70 (diff) | |
parent | 0b00ee6f6c311a7f5c0b4f2441dad97a454d172e (diff) | |
download | qtsensors-33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I1c9e9e40a94ca2ef38de63107b10f211ceaf6c7f
Diffstat (limited to 'src/plugins/sensors/android/src/androidpressure.h')
0 files changed, 0 insertions, 0 deletions