| commit | 8e470749782cc265d7fbb030231cdef926b18991 | [log] [tgz] |
|---|---|---|
| author | Hyunyoung Song <hyunyoungs@google.com> | Thu Aug 27 20:22:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:22:33 2015 +0000 |
| tree | 73def3b48c94e98e819856af2701e0cc598bbf80 | |
| parent | 4af5aa6359141f6ef6c061c5358830eb106d779c [diff] | |
| parent | c10d140d95167f09a0b36b3df73dbb4e926c0cd8 [diff] |
am c10d140d: am 2da21e64: (-s ours) am 13ef17a3: (-s ours) merged ub-launcher3-burnaby, and resolved conflicts * commit 'c10d140d95167f09a0b36b3df73dbb4e926c0cd8':