am a27cb623: Merge "Use C++ template for min/max"

* commit 'a27cb623901d79be1007b0803898086a12ce731b':
  Use C++ template for min/max
tree: d75deaf2899b9f112ab56a63b7d04b8e941e7272
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk