tree a744aba402c9d7a9d62d14ee0794b336cf52d8ca
parent c9492a9c242edebd9befbc9ce116f5bed6443fae
parent 7e34612e2b5db65ecff13ff65b3816fffb7a0974
author Chih-Hung Hsieh <chh@google.com> 1462218475 +0000
committer android-build-merger <android-build-merger@google.com> 1462218475 +0000

resolve merge conflicts of 98a9b2a to nyc-dev-plus-aosp am: 47734c9509
am: 7e34612e2b

* commit '7e34612e2b5db65ecff13ff65b3816fffb7a0974':
  Fix google-explicit-constructor warnings.

Change-Id: I5b1e3eae1348800c288e30845c6eb6d1bf69e72f