OSDN Git Service

am 378529d1: am 5bd11fd6: am 0e3c5e87: am 13ef17a3: (-s ours) merged ub-launcher3...
authorHyunyoung Song <hyunyoungs@google.com>
Tue, 28 Jul 2015 19:58:41 +0000 (19:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Jul 2015 19:58:41 +0000 (19:58 +0000)
commitbc4ddd02f2eedb2cc12db9ea04d3853d76278d28
treefe9ed94353b09dda232fceb64691f96dcd5db8d3
parent102c95dbff6d166292903e40dad7b364e59ef1c9
parent378529d1149d24a640fd98581fdf06926b8a746b
am 378529d1: am 5bd11fd6: am 0e3c5e87: am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflicts

* commit '378529d1149d24a640fd98581fdf06926b8a746b':