| commit | ee454207991660988c1ec1e5bec06ff8bec9ba46 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Sat Sep 26 00:28:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 26 00:28:02 2015 +0000 |
| tree | a9b46cd9f2666ba9aee8ece583546d0cc3525179 | |
| parent | 3a2be577e6947918b114a4b8be95fc9d8ea39a73 [diff] | |
| parent | ffd25c7f1445df9d6b8c28ada7b2174c6827ddcf [diff] |
am ffd25c7f: am 84494473: am aaa9d8dc: Merge "Fix windows build" * commit 'ffd25c7f1445df9d6b8c28ada7b2174c6827ddcf': Fix windows build