junyulai 0355c834d7 [SM07] Make combine subtype configurable from Settings am: 8c526ea1bf ...

Change-Id: Ic8426ae36b5aaadfdd3292a3b70fc9b290443d5c

2020-03-19 06:37:59 +00:00

..

android

Merge changes from topics "am-ad04c8ad832c4674be35bfc5fe4280dd-rvc-dev", "sp21-api-review-feedback", "sp25-networkstats-rename" into rvc-dev

2020-03-17 23:11:34 +00:00

com/android

[SM07] Make combine subtype configurable from Settings am: 8c526ea1bf

2020-03-19 06:37:59 +00:00