tree ad669af4c82ad888f88600af2d56edb4304de6ce
parent 119aa5ab3b50fccce2a9bc8c117072ba5b8742c9
parent 435193132b0d5ab6c40bb85b04e11da43aeb1a4e
author Xavier Ducrohet <xav@android.com> 1252545612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252545612 -0700

am 43519313: Make a library version of the custom emma library.

Merge commit '435193132b0d5ab6c40bb85b04e11da43aeb1a4e' into eclair-plus-aosp

* commit '435193132b0d5ab6c40bb85b04e11da43aeb1a4e':
  Make a library version of the custom emma library.