| commit | fc6be460ca512965aa97cc79756644db8bbe1e72 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Fri Mar 08 02:03:39 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 08 02:03:39 2013 +0000 |
| tree | ca42f574512d50844f62e55126ab2ccd229d8c33 | |
| parent | 0aa50b0d5391be46cd08536b12c9e6a669d21718 [diff] | |
| parent | 4781e30a96f5b0251b8c090351ff8aa20aeddf0d [diff] |
am 4781e30a: resolved conflicts for merge of de949b11 to jb-mr2-dev * commit '4781e30a96f5b0251b8c090351ff8aa20aeddf0d': Add module names to emulator PRODUCT_PACKAGES.