Merge "API Review: Use updated feature flag"
tree: 33d009349fd335aef48bf410b3d27c50dfbfc5a5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml