| commit | fc0d3f13bb59d679f44c744f2c82ef10baa8b5ae | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Thu Mar 14 19:49:54 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 14 19:49:54 2013 +0000 |
| tree | d4799174b3fe5a1f475936d94404fd05e35d67df | |
| parent | 34247824d80da876ffd4b7d0e700036fb47eef35 [diff] | |
| parent | 85754ea5f2ebd118d621a9b553edb4e8763001c4 [diff] |
am 85754ea5: am cdfb5bac: resolved conflicts for merge of a3aea5b6 to jb-mr2-dev * commit '85754ea5f2ebd118d621a9b553edb4e8763001c4': Build SDK using prebuilts/devtools.