Merge "Convert EditInfoActivityTest to a unit test." into oc-dr1-dev am: 28deee0e9d
am: cda9f8cdf5

Change-Id: Ie916814603f3b8b2880853f659ef859b7868a842
tree: 9429a6b4c15e7429c6a16cfda0d1fcc8522f7d33
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags