John Reck 4a3b0c7587 resolve merge conflicts of 24e38ab to stage-aosp-master ...

Change-Id: I25844e17d2d6371ed786833c756051d19d0abec4

2016-08-22 15:13:01 -07:00

..

androidfw

Unicode: specify destination length in utf8_to_utf16 methods

2016-07-29 17:54:30 +01: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 24e38ab to stage-aosp-master

2016-08-22 15:13:01 -07:00

input

Remove Pointer Capture API

2016-06-08 20:13:53 +00:00

storage

…

usb

accessorytest: Remove bad code

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