tree b8f42e6f1812753a7748e8a825e3ac57154d8595
parent c9107e326389ce9ede59792e9abc7d6407608b82
parent 9c0b881c9d6b9705ed3328e10726aa1e2e24a449
author Chih-Hung Hsieh <chh@google.com> 1471314702 +0000
committer android-build-merger <android-build-merger@google.com> 1471314702 +0000

Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3
am: 9c0b881c9d

Change-Id: If4ec2ed4609d130e2b25dae2bf90f2209878cd4c