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