am 2be38a0f: (-s ours) Merge "DO NOT MERGE: Fix a bug where the sequence numbers would be wrong" into ics-mr1

* commit '2be38a0faf23cd06f36d2be21feb72a30f23ff97':
  DO NOT MERGE: Fix a bug where the sequence numbers would be wrong
tree: 6d7c7b49f9deb6d155c9d8dba15f29bd8bed9620
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk