tree e520abc3b4e72d273ebee357fa4e1b8055309c7f
parent 725be0c7ffc5a4a4e72326dfd93201f422d9df96
parent f04e5ddd4e12162e2cf6d371fbc874c2c7d7e98e
author Chih-Hung Hsieh <chh@google.com> 1471303239 +0000
committer android-build-merger <android-build-merger@google.com> 1471303239 +0000

Merge "Fix google-explicit-constructor warnings." am: 52197e3286
am: f04e5ddd4e

Change-Id: Id47e82de445209d06ccdaec1eabaefe485ee9193