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