tree 5d6f8af66bb917b74fc600582a7fe7d6bad3312a
parent 4f16aa9aec9705a74c7d518614c1f16e0cd65c5d
parent 8374a5481394e89c46ecc0b7cf60381637edaaa5
author Christopher Ferris <cferris@google.com> 1417487836 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417487836 +0000

am 8374a548: Merge "Specify .cpu cortex-a15"

* commit '8374a5481394e89c46ecc0b7cf60381637edaaa5':
  Specify .cpu cortex-a15