| commit | 378529d1149d24a640fd98581fdf06926b8a746b | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Tue Jul 28 19:38:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 28 19:38:18 2015 +0000 |
| tree | fe9ed94353b09dda232fceb64691f96dcd5db8d3 | |
| parent | cc619e2eca624d293e0e7f65f82305a5d925dbf7 [diff] | |
| parent | 5bd11fd60e06807a6709e1aaf16ce3c9d2448f97 [diff] |
am 5bd11fd6: am 0e3c5e87: am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflicts * commit '5bd11fd60e06807a6709e1aaf16ce3c9d2448f97':