am aa33b05b: am eefa1c9a: Merge "Fix some action bar logic" into lmp-dev

* commit 'aa33b05b85d8d5053e8f6b9dd943c6eeadceb9c4':
  Fix some action bar logic
tree: 7bfadd822589bafcec5d3b3dfa5d7763539d6506
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags