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)
commitfc6be460ca512965aa97cc79756644db8bbe1e72
treeca42f574512d50844f62e55126ab2ccd229d8c33
parent0aa50b0d5391be46cd08536b12c9e6a669d21718
parent4781e30a96f5b0251b8c090351ff8aa20aeddf0d
am 4781e30a: resolved conflicts for merge of de949b11 to jb-mr2-dev

* commit '4781e30a96f5b0251b8c090351ff8aa20aeddf0d':
  Add module names to emulator PRODUCT_PACKAGES.