Fix merge of short constants to not give int.

Change-Id: I34a2be26cab72af759ec9fa9f6e7470bb43923eb
1 file changed
tree: 062ae8a984dd7effb8fa6f95c055bac0b1be2dd1
  1. Android.mk
  2. build/
  3. oat_process/
  4. oat_runtime/
  5. src/
  6. test/
  7. tools/