tree 252c19a92e861d9881bde1ca30f5b9582601e24a
parent da47ba180655c11c8b4104610c59d4ce63149467
parent 08276a051cac2bdbaf04079d2fbfc766c2e3915c
author Fan Zhang <zhfan@google.com> 1522120114 +0000
committer android-build-merger <android-build-merger@google.com> 1522120114 +0000

Merge "Add metrics for new settings conditional cards." into pi-dev am: 930f74d00d
am: 08276a051c

Change-Id: Ic3b24bd25048a3495e849f3689dc60a59fbda6b1