OSDN Git Service

resolve merge conflicts of acc275a to nyc-dev-plus-aosp
authorChih-Hung Hsieh <chh@google.com>
Mon, 25 Apr 2016 23:15:55 +0000 (23:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 23:15:55 +0000 (23:15 +0000)
commit0fa158c73d174d18ed919f9851fb3aba4219a635
tree41495514ebcc18f54898efbb185deb1e0d69cfc2
parentf4220ff728484ac6d68a6bde40750f9c20ef2844
parent2f94665879231866f0395bc2d9df369a4562e0db
resolve merge conflicts of acc275a to nyc-dev-plus-aosp
am: 2f94665

* commit '2f94665879231866f0395bc2d9df369a4562e0db':
  Fix google-explicit-constructor warnings.

Change-Id: I03bf59b672bbf33bb88da7e475f63a5f8eadc65a