Merge "Fix GCC 6.3 warnings in aosp/master" am: 1211e9fe1b am: 56ed30da81 am: 2bd761c309
authorPyry Haulos <phaulos@google.com>
Thu, 24 Aug 2017 17:53:08 +0000 (17:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 17:53:08 +0000 (17:53 +0000)
am: 10d242c3d6

Change-Id: I0e5496e2a223ffc2ff2422ae1d75b1a581dc009b


Trivial merge