Merge "Remove usages of ActionBarActivity." into oc-dev
tree: f4518f2fb97824e0587c890f8a94892955ed3ef4
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE