| commit | 674f28704d9734946ffbfa703da0d5e0e768350b | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 10:36:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:36:40 2015 +0000 |
| tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
| parent | 8c1be8a2f6102a07f1479d16a6e56dad955fac53 [diff] | |
| parent | bda7780daedf017b46da61610ea4c0fa93e8d82c [diff] |
am bda7780d: (-s ours) am 12cf0f9c: am eba23aaa: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in frameworks/base/tools." * commit 'bda7780daedf017b46da61610ea4c0fa93e8d82c':