tree dd088658e94802c23c28737cad2943dc6b0a8c50
parent 5b0e3f9fda7ddfef66ad90b95dd6c1cb6ce115d8
parent edacbbc69a13b76442263964833b5fc445c87177
author Dan Albert <danalbert@google.com> 1399679213 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399679213 +0000

am edacbbc6: Adds an Android makefile

* commit 'edacbbc69a13b76442263964833b5fc445c87177':
  Adds an Android makefile