tree 9cfb373249d09c1e442167cb402f37098e89ab7c
parent 4ab1187c0eaab64ab3428b4bda807a6791d5e99a
parent 1accd9e13f6ea85a7bc4991085f1cf21b7a36ec0
author Mike Lockwood <lockwood@android.com> 1250103918 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1250103918 -0700

am 1accd9e1: (-s ours) DO NOT MERGE: cherry-pick: Remove libaes from the build.

Merge commit '1accd9e13f6ea85a7bc4991085f1cf21b7a36ec0'

* commit '1accd9e13f6ea85a7bc4991085f1cf21b7a36ec0':
  DO NOT MERGE: cherry-pick: Remove libaes from the build.