tree 5869f15d1cb5765f2b4cec992650428b82f1dae3
parent ad3f2ee0dfbd8d63ffa81d4bb126c7d2cfaded2b
parent ae9787514d5709dff766f4791c00a4875eebbf50
author Tao Bao <tbao@google.com> 1426822075 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426822075 +0000

am ae978751: am 261e195d: Merge "Make the generated OTAs repeatable"

* commit 'ae9787514d5709dff766f4791c00a4875eebbf50':
  Make the generated OTAs repeatable