tree e3a489a6450885dbf0157bbb26306bd539054746
parent 67b1761534d7e2518830cfb3d2c28271ffe56a26
parent 6eb3b8d3b7ffc1d80ae7734042e2c4d36a77a19f
author Adam Powell <adamp@android.com> 1357761816 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357761816 -0800

am 6eb3b8d3: Merge "Upgrade the app to better follow holo guidelines"

* commit '6eb3b8d3b7ffc1d80ae7734042e2c4d36a77a19f':
  Upgrade the app to better follow holo guidelines