tree 09585d4308ba8842bf631fdbce6883cc36b4b46f
parent 224a0640c988a33aace9b2a81548613067fb7ca8
parent 71cf9e58a14b942ad313d0c5c280e207933e9841
author Adrian Roos <roosa@google.com> 1416518760 +0000
committer android-build-merger <android-build-merger@google.com> 1416518760 +0000

am cbd48c72: Merge "Honey I shrunk the navigation bar" into lmp-mr1-dev
automerge: 71cf9e5

* commit '71cf9e58a14b942ad313d0c5c280e207933e9841':
  Honey I shrunk the navigation bar