tree 08c9c213ed1780e8a59f72c73d87654dc30381ce
parent 75ab96a83fe3fa3e16294e5d951bf37323477b88
parent 87bc4f1ee74e6f7abe4611d7618f0404e4981290
author Jordan Liu <jminjie@google.com> 1570648976 -0700
committer android-build-merger <android-build-merger@google.com> 1570648976 -0700

Merge "Rename DEFAULT_CARD_INDEX" am: 038d1b5b27 am: 6802dbb6d5 am: 520be09949
am: 87bc4f1ee7

Change-Id: I1e62b6ed85c8789bcb19e134ef05ad8a2b89a428