commit | 27b0a95299d5702dd52b159ee681b7d9a50ca59a | [log] [tgz] |
---|---|---|
author | Winson Chung <winsonc@google.com> | Mon Jun 01 18:35:24 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 18:35:24 2015 +0000 |
tree | a415333017727980387140d202431638e0199dd3 | |
parent | 25125e77d66febf62c59cda5880f84a1f295817e [diff] | |
parent | d6850edf87c34134fa3a4c6145e221d7dc0f9d70 [diff] |
am d6850edf: Merge "Avoid merging sections across scripts." into ub-launcher3-burnaby * commit 'd6850edf87c34134fa3a4c6145e221d7dc0f9d70': Avoid merging sections across scripts.