| commit | a565fb3c6cd8aadef4cf10e4d951d8c797a479c3 | [log] [tgz] |
|---|---|---|
| author | Mathew Inwood <mathewi@google.com> | Wed Oct 29 07:08:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:08:05 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | d1df79ffc3eb61a7f9befd1b3442483d282a0b73 [diff] | |
| parent | 7118d9dd17f51d998440f257935d6670c927383f [diff] |
am 7118d9dd: am d6518c4b: (-s ours) am 48e725bd: (-s ours) am 56ca86b7: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit '7118d9dd17f51d998440f257935d6670c927383f':