commit | d2d034f154c935f41a01faef6a5e275150981ea0 | [log] [tgz] |
---|---|---|
author | Scott Main <smain@google.com> | Fri Feb 18 19:49:10 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Feb 18 19:49:10 2011 -0800 |
tree | 0c4da192d8cde0d68423d38669f3631ade2a42c1 | |
parent | 1ca584a2bb5c0f0e747c98f2e930cce8b53421a5 [diff] | |
parent | b5d35088cbbbac53b052ec52f199de4ad8b061e7 [diff] |
am b5d35088: resolved conflicts for merge of b842629c to honeycomb-plus-aosp * commit 'b5d35088cbbbac53b052ec52f199de4ad8b061e7': docs: update sizes and sums for tools and ndk