Merge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b
authorPyry Haulos <phaulos@google.com>
Tue, 9 May 2017 18:53:23 +0000 (18:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 May 2017 18:53:23 +0000 (18:53 +0000)
am: 56ed30da81

Change-Id: I226c177f0351e56858170914ecbf3debf459fd44


Trivial merge