tree 104780f3141b2dd7a08c5ca91ce607bb7b82bbe5
parent 7353e43b850cd532c7d35969291757d5145eada2
parent 9caacbd74328624dfc753cecfc42cb29bf14bfad
author Jean-Baptiste Queru <jbq@google.com> 1325900467 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1325900467 -0800

am 9caacbd7: am 5ea72eff: Use the new location of the emulator kernel

* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad':
  Use the new location of the emulator kernel