| commit | 65b2e6737309ad7f403c4820075612a9640f4ded | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Wed Oct 29 07:08:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:08:03 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 08ac7d15c93d5f0195f3091c17737bb9162f62f6 [diff] | |
| parent | d223b88f0dbff7cd66876e691345df5c1ede242b [diff] |
am d223b88f: am cd76f89f: (-s ours) am 6508fe1b: (-s ours) am d0642c42: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit 'd223b88f0dbff7cd66876e691345df5c1ede242b':