| commit | 6c56dd64b25eaba741b41888e98ea31bd34202b2 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Tue Jul 13 19:02:25 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 13 19:02:25 2010 -0700 |
| tree | a25b7465cfe8fef2068803551e1e1d6fc554fe88 | |
| parent | 4a1addef83d6458ba41b498648a36046a27a01b8 [diff] | |
| parent | a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13 [diff] |
am a9b02f0b: resolved conflicts for merge of a6bed2f7 to gingerbread Merge commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp * commit 'a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13': Add phony target dist_libraries