commit | 07e0ee7cf473c6c0afef906164b775ac6d4984f8 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Feb 05 20:15:04 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 20:15:04 2015 +0000 |
tree | ac8228ec845299e9f432c9aa06877935f830a8d4 | |
parent | 7a73b2eecd7b74d0a2091119d087cdfa105d449e [diff] | |
parent | dcbeb41a673e3fa6eb8344e9c806cb8a5f7eeff5 [diff] |
am dcbeb41a: am d558530b: Merge "Fix Windows build." * commit 'dcbeb41a673e3fa6eb8344e9c806cb8a5f7eeff5': Fix Windows build.