tree 301c5cb124fc7cb094cfb05e9ed78ffae314ba29
parent bd55fc56e12e6527e3a6db488cf3be101ec0a1d5
parent 2e0551e58fcf26a82e7b52c1fbfe50dc3ef5fad6
author smain@google.com <smain@google.com> 1402698426 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402698426 +0000

am 2e0551e5: am 77a6812d: Merge "add About secondary nav bar and delete the Wear custom header" into klp-modular-dev

* commit '2e0551e58fcf26a82e7b52c1fbfe50dc3ef5fad6':
  add About secondary nav bar and delete the Wear custom header