| commit | 43647a68e0758ed7e0a03ea4e64bb9634bddfd72 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 20:04:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:04:17 2015 +0000 |
| tree | acd3e38539512eb037d74a6af7719b655d80b613 | |
| parent | 3c3c920e598a8feba9264d2d838e2e4b0eb15a1b [diff] | |
| parent | 674f28704d9734946ffbfa703da0d5e0e768350b [diff] |
am 674f2870: am bda7780d: (-s ours) am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools." * commit '674f28704d9734946ffbfa703da0d5e0e768350b':