| commit | c10d140d95167f09a0b36b3df73dbb4e926c0cd8 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Thu Aug 27 12:16:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:16:34 2015 +0000 |
| tree | f8e23431207ebac6f3d86f039f21c1bd101289eb | |
| parent | 82bf63fbdff18686ab28e3c510e3b2dda9046979 [diff] | |
| parent | 2da21e64592f5016b78d3cc0fb533ded35d12ca3 [diff] |
am 2da21e64: (-s ours) am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflicts * commit '2da21e64592f5016b78d3cc0fb533ded35d12ca3':