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