Jatin Matani 0dacfff5d1 resolved conflicts for merge of d711426a to mnc-dr-dev ...

Change-Id: I2113be7af0f4abe0816c6985b394a73395206c2d

2015-07-13 03:01:27 -07:00

..

accessibility

Fix master build.

2015-02-11 13:32:13 -08:00

compat

am 8c2591ee: Bring back shortcuts and add to dictionary UI

2015-07-11 02:28:19 +00:00

dictionarypack

Don't prompt before downloading.

2015-06-25 15:01:04 -07:00

event

Disable the Burmese keyboard.

2015-01-29 10:17:33 -08:00

keyboard

Set background color for emoji category tabs.

2015-03-18 18:48:30 -07:00

latin

resolved conflicts for merge of d711426a to mnc-dr-dev

2015-07-13 03:01:27 -07:00