am eda8303b: Merge "Fix 5511057 Action bar UI is broken when sorting within an album" into ics-mr1

* commit 'eda8303bebf12f60edf15a2abbc08b99a7c35eef':
  Fix 5511057 Action bar UI is broken when sorting within an album
tree: e83cfc166922c417cb7587e29c25c1b19085163b
  1. gallerycommon/
  2. src/
  3. src_pd/
  4. tests/