Merge "Merge "InputSettings: Define order of items in Physical keyboards screen." into nyc-dev am: 56f7bc44a1
am: 48bd6631af" into nyc-mr1-dev-plus-aosp
am: 4f9d0c95c5
* commit '4f9d0c95c520abe8f17b4f17955fa9241fcea16c':
Change-Id: Ib1aceef944bb460502a0f424581093704793aec6
This commit is contained in: