tree 9b9d16dfaded74da356597889544b8575cea3307
parent 64b83ce632c424f09dbce504be60f5ef9c249e45
parent 49635c7147d1e71d052b80d89c69785baaee99b3
author Huy Nguyen <huynguyen@google.com> 1395283619 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395283619 +0000

am 49635c71: am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '49635c7147d1e71d052b80d89c69785baaee99b3':