Merge "Fix a failing test."
tree: a841f5d0aad75a1c61f0a448aabc58f2b8a62688
  1. res/
  2. src/
  3. test/
  4. android-changes.txt
  5. Android.mk
  6. build.xml
  7. moe.sh
  8. NOTICE