commit | 8449447384a882e302861892ea6edf92ebd4d55e | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Sat Sep 26 00:15:44 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 26 00:15:44 2015 +0000 |
tree | 663899376280891d4f563979a321ded2e68efdc7 | |
parent | cf26cbfb48a795c9e4c21d9219ec5ad26e69f044 [diff] | |
parent | aaa9d8dc0aba0446fb11238f2aa869ce0b33df2f [diff] |
am aaa9d8dc: Merge "Fix windows build" * commit 'aaa9d8dc0aba0446fb11238f2aa869ce0b33df2f': Fix windows build