tree cba62d0d64153aa2169651696bc238591341d679
parent cb168d34aef2da06f5d9110a07ceeca82b72f41d
parent 524ed6addab4294f3be29cfbef5ef571077ca3a4
author Juan Silveira <jjso@google.com> 1445300932 +0000
committer android-build-merger <android-build-merger@google.com> 1445300932 +0000

am 9ee14249: am 07130d40: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 524ed6adda

* commit '524ed6addab4294f3be29cfbef5ef571077ca3a4':