tree 970f7382960c384acca1172ffd342bc46099cf00
parent b8fdcc2b65c1662ab441afd368a86beee58185ec
parent d62c7277dc300214bc289005c0402d3fc66c8730
author Chih-Hung Hsieh <chh@google.com> 1468362236 +0000
committer android-build-merger <android-build-merger@google.com> 1468362236 +0000

Merge \\"Fix google-explicit-constructor warnings in keystore.\\" am: 590a1dade7
am: d62c7277dc

Change-Id: I7658c6aaa0bc9ac8ebb31bf30697a54b1738bacb