tree 844f84df3d585007804d150e5b60031b1244855a
parent 22e58a6952e5be39f9bea1741d491aa071805769
parent 0f3bceb0f0c40ae6cbf2084beed8161662c12912
author Julien Desprez <jdesprez@google.com> 1525154904 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1525154904 +0000

Merge "Support keystore even in local sharding" into pi-dev