tree c65052b0720b621aee00b38d07e28bd83138c50d
parent 657b884df2d8d261d5f5a140f5540e21284fe880
parent 51b1c83946b390eb0861a899e26f77319c3f45ad
author Winson Chung <winsonc@google.com> 1433192623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433192623 +0000

am 51b1c839: Avoid merging app sections across scripts.

* commit '51b1c83946b390eb0861a899e26f77319c3f45ad':
  Avoid merging app sections across scripts.