Neil Fuller 7dbefdcb92 resolve merge conflicts of 26119befba to pi-dev-plus-aosp ...

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Iea64af5a88c9bf399fb26468e931be3c73061bac

2018-06-07 20:02:59 +01:00

..

androidfw

Merge "Fix DynamicRefTable::load security bug" into oc-mr1-dev am: 2b6805fedc

2018-06-06 16:09:35 -07:00

hwui

Merge "cts case com.android.server.cts.GraphicsStatsValidationTest#testDaveyDrawFrame in modue CtsIncidentHostTestCases failed" am: 2dd3d8cbef

2018-06-04 19:42:29 -07:00

incident

Adding batterystats history to proto dump.

2018-05-07 17:53:57 -07:00

input

Remove obsolete pragma statements

2018-02-23 15:48:10 -08:00

protoutil

This cl tries to fix cts tests IncidentdTest

2018-04-04 16:29:55 -07:00

services

Merge "DropboxManager: Add err message if passing an invalid fd to addFile()" am: 90529d212a am: 13d6ac4a35

2018-01-30 18:55:57 +00:00

storage

…

usb

Convert host tools to Android.bp

2017-09-09 06:18:48 +00:00