| commit | fe3d7b1d92924715f8d3d3cc253ef7bbc44dfb98 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 11 23:23:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 11 23:23:52 2015 +0000 |
| tree | 5c58239838cdb160a651a42777153dcee23b4935 | |
| parent | 5a2de8b711188540b98aae9d72a46c12a6e679c5 [diff] | |
| parent | de4c716ab08ab12d6a5f8fbd76c9f0c5530a1d61 [diff] |
am 9336ee38: Merge "Fix (Windows) build." * commit '9336ee389f79296d04790d1a1dab6f55b6a4c221': Fix (Windows) build.