tree 75721cc6908860cf7cd325ff5c1ef12341dd85a6
parent 98255dc988ad51bb900ff5cd2571071e120d0080
parent 6d0899ea4735293cca61661366dd98917f200bb3
author Christopher Ferris <cferris@google.com> 1391656069 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391656069 +0000

am 6d0899ea: am afbbce3f: Merge "Add library test makefile solutions."

* commit '6d0899ea4735293cca61661366dd98917f200bb3':
  Add library test makefile solutions.