| commit | c318b48064383cf74a657a4f1cd8aae61633690e | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Mon Apr 06 20:24:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 06 20:24:25 2015 +0000 |
| tree | 1b2558ba523c68d729f2b70ef900cb8950323f52 | |
| parent | 8977d3d1c1c3b36c57eef4d968200685ffa4bc79 [diff] | |
| parent | 2e52c90b3ff0a04bd734aa19c54c39cef186b653 [diff] |
am 2e52c90b: resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby * commit '2e52c90b3ff0a04bd734aa19c54c39cef186b653': resolved conflicts for merge of 68fdeaad to ub-launcher3-burnaby