tree d91ef05488918d6dc31da95efa6030afa3aeb427
parent b52d7515fa062f431ce48833fd1d625b6de2ba7c
parent 167afeb0d364fb8659e71fad94d6295b59407af1
author Scott Randolph <randolphs@google.com> 1548308615 -0800
committer android-build-merger <android-build-merger@google.com> 1548308615 -0800

Merge "Add a new column: subscription_type to siminfo table." am: 141eceb49f am: dee22ae28a
am: 167afeb0d3

Change-Id: I462c2428ff51da08777825db7db211f36835e434