Stephen Hines 846799d693 resolve merge conflicts of f53bfc9 to master ...

Change-Id: Idb454415b166b2ff215c604475dd9129958e7edd

2016-07-21 22:19:07 -07:00

..

androidfw

AAPT2: Remove usage of u16string

2016-07-13 17:45:28 -07:00

common_time

Fix misc-macro-parentheses warnings in common_time.

2016-05-19 15:21:42 -07:00

hwui

resolve merge conflicts of f53bfc9 to master

2016-07-21 22:19:07 -07:00

input

Remove Pointer Capture API

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

storage

Fix google-explicit-constructor warnings.

2016-04-27 11:38:12 -07:00

usb

…