| commit | 08ac7d15c93d5f0195f3091c17737bb9162f62f6 | [log] [tgz] |
|---|---|---|
| author | Adam Skory <skory@google.com> | Wed Oct 29 07:07:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:07:55 2014 +0000 |
| tree | 10da860fcff71886af91d082e31f0e1917926848 | |
| parent | 6d9a6398d72135bdfb658c9966a5dc7443a9eb61 [diff] | |
| parent | 69925bb1923f86f4b590962cdcd4299b98b9f30d [diff] |
am 69925bb1: am 9c114bb7: (-s ours) am b3461336: (-s ours) am 853b55b9: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release * commit '69925bb1923f86f4b590962cdcd4299b98b9f30d':