Mathieu Chartier 47bd079e99 Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07 am: f5ae9a62da ...

am: bbffcf3416

Change-Id: Ie97112b428884a885cb7c203e681dca03d3f4d67

2019-06-04 20:47:07 -07:00

..

java

Merge "Only set mStartClockTime when device is fully charged." into qt-dev am: 28d28a4ee5 am: 33add786a6

2019-06-04 20:41:37 -07:00

jni

Merge "Fix some bugs in dumpsys meminfo attribution" into qt-dev am: 652b445c07 am: f5ae9a62da

2019-06-04 20:47:07 -07:00

proto

Merge "Add Usage info for LocationManager's APIs" into qt-dev am: 11ddc8ea0b am: 98eed7dcca

2019-05-30 13:09:03 -07:00

res

Merge "Update themed icons." into qt-r1-dev am: a1da7a4ef5

2019-06-04 18:20:18 -07:00

tests

Merge "Update themed icons." into qt-r1-dev am: a1da7a4ef5

2019-06-04 18:20:18 -07:00

xsd

…