Merge "Fix some action bar logic" into lmp-dev
tree: 2ac00ac6b0ec7ad35e8ddb7dc2baf7f0dda395b4
  1. Android.mk
  2. AndroidManifest.xml
  3. proguard.flags
  4. res/
  5. src/
  6. tests/