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

Change-Id: I8d413cdae5423ba690af7e5b7f114771f94ad35b


Trivial merge