| commit | 3c92c20ed710855f8a83473603fd225578de9ffb | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jan 09 21:37:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 09 21:37:05 2014 +0000 |
| tree | 825ad95313ace2e362dca75a0f0c65d4c2051632 | |
| parent | 0c449f7f5fd676af30767a230df67c1c083fed7a [diff] | |
| parent | 229a9f3dab91b65d0a35b91b7403895797f0380d [diff] |
am 229a9f3d: am 054d7849: resolved conflicts for merge of 7d85d0a9 to master * commit '229a9f3dab91b65d0a35b91b7403895797f0380d': Update build tools to 19.0.2