tree 10da860fcff71886af91d082e31f0e1917926848
parent 6bd055c5d6e38251af26e69d80b8629a4d0e345f
parent f6619645af9da5728170736ebb94976625e732b5
author Huy Nguyen <huynguyen@google.com> 1414566499 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566499 +0000

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

* commit 'f6619645af9da5728170736ebb94976625e732b5':