| commit | 95ee0fbcb3e7bd80213ce2354057b493da8161b2 | [log] [tgz] |
|---|---|---|
| author | Raphael Moll <raphael@google.com> | Thu Oct 10 15:40:34 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 10 15:40:34 2013 -0700 |
| tree | 552e2a36f7ab7be71b5f332d58a75cb578fa16ab | |
| parent | 938b6b66fbb586935da99e76e7c3e184cf031c87 [diff] | |
| parent | 906ec536f24a6231e63371276db257f1bf1ed9f8 [diff] |
am 906ec536: am 37684bb0: Merge "resolved conflicts for merge of 14794b20 to klp-dev" into klp-dev * commit '906ec536f24a6231e63371276db257f1bf1ed9f8': Android SDK: build tools 18.1.1 (RS fixes: windows EOL, YUV-to-RGB)