Compilation fix: N-MR1 merge.

Change-Id: I1348592fa7b91802f68f66cbe5dd41aac30761c6
2 files changed
tree: 0351742c3215b5446f896fa58311fed2acadc41d
  1. assets/
  2. icons/
  3. res/
  4. src/
  5. TestCommon/
  6. tests/
  7. AndroidManifest.xml
  8. build.gradle