Merge "Fix references to two constants"
tree: 4ac4e8ef5fa26c2a3b708d916632b6ce1d722855
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags