| commit | 5cc929caa0922e0b80dbf3f6c099d841c3797c20 | [log] [tgz] |
|---|---|---|
| author | Adam Skory <skory@google.com> | Thu Mar 20 02:46:56 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 02:46:56 2014 +0000 |
| tree | 9b9d16dfaded74da356597889544b8575cea3307 | |
| parent | 2b8dbe3a5f5f673e87aa4b13133a4d3bf2b98b3c [diff] | |
| parent | b346133679f409e3f4e7389c5dced451b9980a57 [diff] |
am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit 'b346133679f409e3f4e7389c5dced451b9980a57':