tree 10da860fcff71886af91d082e31f0e1917926848
parent 08ac7d15c93d5f0195f3091c17737bb9162f62f6
parent d223b88f0dbff7cd66876e691345df5c1ede242b
author Anton Hansson <hansson@google.com> 1414566483 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566483 +0000

am d223b88f: am cd76f89f: (-s ours) am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit 'd223b88f0dbff7cd66876e691345df5c1ede242b':