Fix merge that should have been manually merged

master was still using the deleted constants in different places and
Java 6 didn't like the imports.

Change-Id: If9472a2acb029e56790dc4d19ab62e608c970175
1 file changed
tree: 80a1a10f1b3183666b208cae0c490c2f345f1acd
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. Android.mk
  6. CleanSpec.mk