tree dab731b754027d83c9df0f4a416cb680a914911d
parent ae08003115488e08b69e0db2e75eca56405bd928
parent cbd48c722a40aff8bc2855d735bd34159b5df8ba
author Adrian Roos <roosa@google.com> 1416495529 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1416495529 +0000

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

* commit 'cbd48c722a40aff8bc2855d735bd34159b5df8ba':
  Honey I shrunk the navigation bar