| commit | 5f4f3435824c01d980d64e3323618d209fd3ac03 | [log] [tgz] |
|---|---|---|
| author | Mark Ashdown <ashdown@google.com> | Wed Oct 29 07:08:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:08:06 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | a565fb3c6cd8aadef4cf10e4d951d8c797a479c3 [diff] | |
| parent | 29923f5082093b6211894f49edc653c29b28d99b [diff] |
am 29923f50: am 6cea6748: (-s ours) am a4d0ef3c: (-s ours) am 7c9f3348: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit '29923f5082093b6211894f49edc653c29b28d99b':