Merge "Enable SMS in carrier demo mode" into nyc-mr2-dev

am: 42dfcc772b

Change-Id: I8d36badab79c40e5a65a88ca4ed418409cd17e24
This commit is contained in:
Justin Klaassen
2017-02-01 05:21:01 +00:00
committed by android-build-merger

Diff Content Not Available