Andreas Gampe db47069d52 Merge changes I66eac0c5,I07602072 into qt-dev ...

am: e252d155b1

Change-Id: I36bd613d2bdb264760d0e07fb2a2c3b05f2302f1

2019-06-11 20:14:58 -07:00

..

java

Merge "Removed the AmbientPulseManager" into qt-r1-dev

2019-06-12 01:35:18 +00:00

jni

Merge changes I66eac0c5,I07602072 into qt-dev

2019-06-11 20:14:58 -07:00

proto

Add Usage info for LocationManager's APIs

2019-05-30 03:41:17 +00:00

res

Merge "Interpolate low light white balance" into qt-r1-dev

2019-06-11 22:06:17 +00:00

tests

Revert "Take all VPN underlying networks into account when migrating traffic for"

2019-06-07 02:33:30 -07:00

xsd

…