tree bb7b2297017f3fd7b4be4865ff0e63045b9e589a
parent 27b0a95299d5702dd52b159ee681b7d9a50ca59a
parent 585b764ae24c7869704c428d1739e151e989674d
author Winson Chung <winsonc@google.com> 1433186893 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433186893 +0000

am 585b764a: Merge "Revert "Avoid merging sections across scripts."" into ub-launcher3-burnaby

* commit '585b764ae24c7869704c428d1739e151e989674d':
  Revert "Avoid merging sections across scripts."