| commit | 80f7c594fae3f1b19e3ea78938de450418fe183c | [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 | cd17f77bf1022f1dd132aecd6d13aa604b89e3c6 | |
| parent | 567882e1f9a31d78cba8ea7f1112d0a9e42d137a [diff] | |
| parent | f4a29403ae5b6d3e8e754a025d33f0c33adecb21 [diff] |
am f4a29403: resolved conflicts for merge of 70c3d1c2 to honeycomb-plus-aosp * commit 'f4a29403ae5b6d3e8e754a025d33f0c33adecb21': Add external dependency API.