OSDN Git Service

am 4781e30a: resolved conflicts for merge of de949b11 to jb-mr2-dev
authorYing Wang <wangying@google.com>
Fri, 8 Mar 2013 02:03:39 +0000 (02:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Mar 2013 02:03:39 +0000 (02:03 +0000)
* commit '4781e30a96f5b0251b8c090351ff8aa20aeddf0d':
  Add module names to emulator PRODUCT_PACKAGES.


Trivial merge