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

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

Change-Id: Ie0f3f1be4ee7ba9fbe249b951b452642c505895a