tree 48cd75a790529594fb8c32ac0f6705768968c279
parent 40b9734cd6f6b157700e1fc9149bc04c0ce5b185
parent e2a0f15c08827ee854f3bffdf78d2f4db49d4fe5
author Greg Hackmann <ghackmann@google.com> 1396481763 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396481763 +0000

am e2a0f15c: Merge "Regenerate adf header"

* commit 'e2a0f15c08827ee854f3bffdf78d2f4db49d4fe5':
  Regenerate adf header