Fix build breakage due to bad manual cherry-pick

Change-Id: I1a020321ba71760485aa4df2313d3877c4795f5a
1 file changed
tree: 9db09844b78d7fac1d8fd89940e7aa66523f167f
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags