am 5d2c1d54: Merge "Ensure sort menu is shown as needed." into mnc-dev

* commit '5d2c1d54b953ac0e4243210237fec92e3105844e':
  Ensure sort menu is shown as needed.
tree: e5fe230122e29a12dcb2058d90c05322851eca22
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py