tree 791e8a024420d9fc398174c0a56fc1722d4c771c
parent 3e5bae9519d4e9312ff7a4561a1ab47b7623376f
parent e1ac2ece027431e995b44d379cd03f636c95fb9c
author Huy Nguyen <huynguyen@google.com> 1445307849 +0000
committer android-build-merger <android-build-merger@google.com> 1445307849 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2 am: ab3847b8b3 am: 0cce0579a3 am: 8c9ef49ae5 am: cbdc96152e am: 1115f891dd
am: e1ac2ece02

* commit 'e1ac2ece027431e995b44d379cd03f636c95fb9c':