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

Change-Id: Ib2913a7e951737c23805d2ba25106eb5e695773a


Trivial merge