am 97bca3a8: (-s ours) am d5699e37: (-s ours) am fffd025d: am 74af8088: Corrected issue where history icon placement does not match spec.  DO NOT MERGE

* commit '97bca3a87ac1c636abacd665c5aa611fe1fb764c':
tree: af39ceb9c6cb26c3ee1ea02c1e03de9a2486ac93
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags