tree b9cdf6cc0c8985fc58159d7c07a2dd681f98ee8d
parent b15bcea4d4c05f04212729ca7a4016269a5df1d4
parent a85b48714ac40acdc92d2ecc73cf52a5216e1b7e
author TreeHugger Robot <treehugger-gerrit@google.com> 1522118174 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1522118174 +0000

Merge "Add metrics for new settings conditional cards." into pi-dev