am 742ac681: (-s ours) am f5443e4e: Replace large device keyboard with phone...
am 742ac681: (-s ours) am f5443e4e: Replace large device keyboard with phone style keyboard (DO NOT MERGE)
* commit '742ac681':
Replace large device keyboard with phone style keyboard (DO NOT MERGE)