| commit | 82863327e380c191090240ddd216233443623d1c | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Thu Apr 07 14:22:03 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 07 14:22:03 2011 -0700 |
| tree | 6446fdfd35230a7bd1987c3681f0f6b09751d380 | |
| parent | d278132ec1876a4ce836b3aa0a25de2b610521a3 [diff] | |
| parent | f3eae4d6b86a788289ed79fbdda9ee7ef09275a3 [diff] |
am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp * commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21': Add external dependency API.