tree ac5cf3e75d802862cf895d66174f642ceb8f213d
parent 187e7c7ab027af90409371fd08386e6d1c2eac3b
parent 8d3b85a32005df441ae0afde7b9f924824f1446e
author Chih-Hung Hsieh <chh@google.com> 1461969370 +0000
committer android-build-merger <android-build-merger@google.com> 1461969370 +0000

Merge "Fix google-explicit-constructor warnings." am: fafa6a6531 am: 77d7cb1d0a
am: 8d3b85a320

* commit '8d3b85a32005df441ae0afde7b9f924824f1446e':
  Fix google-explicit-constructor warnings.

Change-Id: I1eac3384574974067701031b952e9a59aac81ba7