Chih-Hung Hsieh 85e0c89ba5 resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp ...

Change-Id: I90807581e10b6a0024515ff634ac8b29eaa5fc9f

2016-04-28 12:08:15 -07:00

..

Android.mk

…

asset_manager.cpp

Fix google-explicit-constructor warnings.

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

choreographer.cpp

Fix google-explicit-constructor warnings.

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

configuration.cpp

…

input.cpp

…

looper.cpp

…

native_activity.cpp

…

native_window.cpp

…

net.c

…

obb.cpp

…

sensor.cpp

…

storage_manager.cpp

Fix google-explicit-constructor warnings.

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

trace.cpp

…