Merge "Add subtext for default keyboard layout." into nyc-dev am: 12c2c2538b
am: e71a6ac6cd
* commit 'e71a6ac6cdcbca69a0f759211b8a08724b7701d8':
Change-Id: I5761dcceb05a7dea7e7d212fa7c7cf765be956d0
This commit is contained in: