| commit | 2e124bc43dc148fd7d39f5d726738d2cdabf32ad | [log] [tgz] |
|---|---|---|
| author | Adam Skory <skory@google.com> | Thu Oct 23 19:33:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 19:33:04 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 667ca4fe80afbfa4e95333de374fa453eb73b121 [diff] | |
| parent | 298a9c61853b7460d5dbe14429f05f8f2deed6bc [diff] |
am 298a9c61: am 78d8510a: am 9e3ebf3c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit '298a9c61853b7460d5dbe14429f05f8f2deed6bc':