| commit | 229a9f3dab91b65d0a35b91b7403895797f0380d | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jan 09 13:33:41 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 09 13:33:41 2014 -0800 |
| tree | de40fcd88feb31fefc59609c9136682d618389b8 | |
| parent | 817e252bd8838771c70b7e9916781b680eeece08 [diff] | |
| parent | 054d78497e129e5dea545e7ea76692aec1bb387f [diff] |
am 054d7849: resolved conflicts for merge of 7d85d0a9 to master * commit '054d78497e129e5dea545e7ea76692aec1bb387f': Update build tools to 19.0.2