| commit | eb6e294febe774e1878d9e8434a55e44d49cd8af | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Wed Mar 09 17:05:10 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 09 17:05:10 2011 -0800 |
| tree | 8f3105647568b60e193683184ffddb82e25fbeee | |
| parent | 51b8edb5173e84eb54fd5f7ad34fc0f67c31f5cf [diff] | |
| parent | f8a7ff191af760ee01e5c31f154f0dbc7abfef7e [diff] |
am f8a7ff19: resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp * commit 'f8a7ff191af760ee01e5c31f154f0dbc7abfef7e': Dist build.prop in sdk builds.