Chih-Hung Hsieh c968879eb6 Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp ...

am: 99feacb026

* commit '99feacb0263f8331e9afcbfdbc0a4322de75593c':
  Fix google-explicit-constructor warnings.

Change-Id: Ifb8bda3157f17c400ae403056bbef3b3c3625ea8

2016-04-28 19:46:13 +00:00

..

android

Merge "resolve merge conflicts of 1599b981 to nyc-dev-plus-aosp am: 85e0c89ba5" into nyc-mr1-dev-plus-aosp

2016-04-28 19:46:13 +00:00

graphics/jni

am 66f5affb: Merge "Fix bug number for linker related workarounds"

2015-09-28 18:23:56 +00:00

copy-to-ndk.sh

…