OSDN Git Service

am fc6be460: am 4781e30a: resolved conflicts for merge of de949b11 to jb-mr2-dev
authorYing Wang <wangying@google.com>
Fri, 8 Mar 2013 02:05:17 +0000 (02:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 8 Mar 2013 02:05:17 +0000 (02:05 +0000)
commit20178b4f3d7ac25658b2a3d0ddc92c5d9e5eba2d
tree5cf41e97455178b77dfa6baf7252527f99a54f6d
parentdeb2a8d509f756414a542020587eda714ac1670c
parentfc6be460ca512965aa97cc79756644db8bbe1e72
am fc6be460: am 4781e30a: resolved conflicts for merge of de949b11 to jb-mr2-dev

* commit 'fc6be460ca512965aa97cc79756644db8bbe1e72':
  Add module names to emulator PRODUCT_PACKAGES.