| commit | 29923f5082093b6211894f49edc653c29b28d99b | [log] [tgz] |
|---|---|---|
| author | Mark Ashdown <ashdown@google.com> | Thu Oct 23 21:10:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 21:10:20 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 7118d9dd17f51d998440f257935d6670c927383f [diff] | |
| parent | 6cea6748431f5ba346cbee61f569812590fa8a46 [diff] |
am 6cea6748: (-s ours) am a4d0ef3c: (-s ours) am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit '6cea6748431f5ba346cbee61f569812590fa8a46':