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