tree 9b9d16dfaded74da356597889544b8575cea3307
parent b1a081221e3d9e937d2b629e6ec083c3c5a4aa55
parent e35f8e2cacdb44284014b8c7bc688fac9859f632
author Huy Nguyen <huynguyen@google.com> 1395283620 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395283620 +0000

am e35f8e2c: am 8dc2ca68: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit 'e35f8e2cacdb44284014b8c7bc688fac9859f632':