Chih-hung Hsieh 3fb651b0b7 resolve merge conflicts of 5152fd9 to stage-aosp-master ...

am: 05160d70d1

Change-Id: Id1d734fd162d6063fdc818afc68f09809f764c5f

2016-07-22 01:53:29 +00:00

..

androidfw

DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages

2016-06-16 10:24:43 -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 5152fd9 to stage-aosp-master

2016-07-22 01:53:29 +00:00

input

DO NOT MERGE Remove Pointer Capture API

2016-05-17 18:02:37 +01:00

storage

Fix google-explicit-constructor warnings.

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

usb

…