tree a415333017727980387140d202431638e0199dd3
parent 25125e77d66febf62c59cda5880f84a1f295817e
parent d6850edf87c34134fa3a4c6145e221d7dc0f9d70
author Winson Chung <winsonc@google.com> 1433183724 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433183724 +0000

am d6850edf: Merge "Avoid merging sections across scripts." into ub-launcher3-burnaby

* commit 'd6850edf87c34134fa3a4c6145e221d7dc0f9d70':
  Avoid merging sections across scripts.