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