Merge "Remove usages of ActionBarActivity." into oc-dev
am: 28d5e3ca4a

Change-Id: Ic4912b727886f3e9a24f6e4a88ab433b57c19057
tree: 5a2b6df3ec5c90c75f8e55aedf9859cf1bfa7022
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE