Merge "Ensure sort menu is shown as needed." into mnc-dev
tree: 45b1a21553138ad90ad5254ebd00c604f79cc57d
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. wrap_alpha.py