Mark Salyzyn db15537e6e resolve merge conflicts of 082a1721b5 to master ...

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e

2017-01-11 08:30:17 -08:00

..

androidfw

resolve merge conflicts of 082a1721b5 to master

2017-01-11 08:30:17 -08:00

common_time

Merge "Fix google-explicit-constructor warnings in common_time."

2016-08-17 17:42:52 +00:00

hwui

resolve merge conflicts of 082a1721b5 to master

2017-01-11 08:30:17 -08:00

incident

First checkin of incident reporting.

2016-12-15 11:23:05 -08:00

input

resolve merge conflicts of 082a1721b5 to master

2017-01-11 08:30:17 -08:00

services

Add a native class to interact with DropBoxManager.

2016-12-15 11:23:05 -08:00

storage

Convert libstorage to Android.bp am: 3ac2be93a9 am: f12ae4bed7 am: 791d02818a

2016-12-15 07:44:37 +00:00

usb

accessorytest: Remove bad code

2016-07-13 14:24:44 -07:00