tree 2c83f2bac245b202121de79083e0aeabc1396a53
parent 6a6f18506900c67f822cbc7523c04ea6e0a45e72
parent 9a5afa5242a4d179fc45f59944c0fba5ccaa4c15
author Tao Bao <tbao@google.com> 1443475478 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443475478 +0000

am 9a5afa52: am 5e23069b: Merge "build_image.py: Use a fixed timestamp in the generated image."

* commit '9a5afa5242a4d179fc45f59944c0fba5ccaa4c15':
  build_image.py: Use a fixed timestamp in the generated image.