tree 545389cee63291905c8340403da06e38314ff1a6
parent 77ef6b2b5d30713eecd1509f43527f728bad08dc
parent 9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40
author Adam Skory <skory@google.com> 1395277973 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277973 +0000

am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '9e3ebf3c95fbf4b7a96b6080802ca23e5098fe40':
  Do not show overview when menu pressed on CustomContent screen.
  Missing paddingRight added.