tree 123b1c40d6537259afbe57133f0f90369158a71c
parent ea5178545bf939fb65f77cd54eba9f274512638b
parent f994458babc78670263085b027bfaa34ff0bc52a
author Ying Wang <wangying@android.com> 1428182452 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428182452 +0000

am f994458b: am b4b996a8: Merge "Include vendorsetup scripts in order"

* commit 'f994458babc78670263085b027bfaa34ff0bc52a':
  Include vendorsetup scripts in order