Suppress the google-explicit-constructor warning locally. am: bded0f944e am: a33c79fc...
authorChih-Hung Hsieh <chh@google.com>
Tue, 2 Aug 2016 18:07:33 +0000 (18:07 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 Aug 2016 18:07:33 +0000 (18:07 +0000)
am: 11d130b7bf

Change-Id: I7085f71dd9f8f6a7326ffad80a2a01fff205258a


Trivial merge