tree 791e8a024420d9fc398174c0a56fc1722d4c771c
parent b1f7d716f69fb2eab670ffdb2ae74c5818e4d536
parent aa27d4ebde868c000b336df8066ca791fbb1cd75
author Huy Nguyen <huynguyen@google.com> 1445307856 +0000
committer android-build-merger <android-build-merger@google.com> 1445307856 +0000

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68c1 am: a59ef0ba69 am: 8acd2748b2 am: 52599958f4 am: 1c13c13722 am: d848ca4869 am: 4cb42d165f
am: aa27d4ebde

* commit 'aa27d4ebde868c000b336df8066ca791fbb1cd75':