tree cfadff700063f172d2c52425b7cec4c17b80522f
parent a2e03b16dbd0549203f3b856f40f35c16fcf4579
parent 6612e3a338a92ffda807bdcac903018c7d2c13e6
author Jorim Jaggi <jjaggi@google.com> 1399900320 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399900320 +0000

am 790489fa: Merge "Implement settings affordance in header."

* commit '790489faa36ed4c5941803e5c38c7d439b5f213c':
  Implement settings affordance in header.