Tor Norbye 76a293da77 resolve merge conflicts of d2f906a6ad to pi-dev-plus-aosp ...

Merged-In: Ia248aece5250e84e47c815c601133b698bf644c2
Change-Id: Ib1268a96fa633af3f64057e7ced7e4a2fde27da6

2019-01-20 21:20:42 -08:00

..

androidfw

CursorWindow.cpp: replace dup() with fcntl(F_DUPFD_CLOEXEC)

2019-01-14 14:05:06 -08:00

hwui

Merge "Fix/suppress hwui google-explicit-constructor warnings" am: dcfef16295

2019-01-09 15:09:06 -08:00

incident

Fix/suppress incident* google-explicit-constructor warnings

2018-12-20 13:45:04 -08:00

input

Fix/suppress libs/* google-explicit-constructor warnings

2019-01-10 19:52:57 +00:00

protoutil

Fix/suppress libs/* google-explicit-constructor warnings

2019-01-10 19:52:57 +00: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

Update signature files to the new format

2019-01-19 07:22:55 -08:00