tree ca01d9d208af501f17a61fe35ea7fe31589cd65b
parent 6e2fe7d9fa91dcf68b1f2f5f0f32172a6d376770
parent 383130eabe21d24a5a00791d416c712378a4d7f0
author Greg Hackmann <ghackmann@google.com> 1396481762 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396481762 +0000

am 383130ea: Merge "Update adf header"

* commit '383130eabe21d24a5a00791d416c712378a4d7f0':
  Update adf header