Varun Anand ebf59f07b1 Merge changes from topic "vpn_data_accounting" into qt-dev ...

am: b33d2ca2e3

Change-Id: I234eb2b20f47bde94b4aba89867e9d1c7e9ee7d5

2019-05-29 09:44:04 -07:00

..

java

Merge changes from topic "vpn_data_accounting" into qt-dev

2019-05-29 09:44:04 -07:00

jni

Merge "AudioTrack: implement gapless transition for offload mode" into qt-dev

2019-05-28 12:21:11 -07:00

proto

Merge "Add navigation mode to Settings.Secure" into qt-dev

2019-05-26 07:30:42 +00:00

res

Merge "Changed comments to match real protection level" into qt-dev

2019-05-29 09:19:12 -07:00

tests

Merge changes from topic "vpn_data_accounting" into qt-dev

2019-05-29 09:44:04 -07:00

xsd

…