am cd0e0048: Merge "Ensure #offer always actually offers something." into jb-mr1-dev

* commit 'cd0e0048881eb854a4d1524c2d54d6b9bb00f614':
  Ensure #offer always actually offers something.
tree: 8d99a38ab668eb8010ae55d8777a7bfce30b50a8
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk