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

Change-Id: I26a8dd4e1e0d70c858c51dfb867fda7f4eec3fd9


Trivial merge