| commit | 24f9e25bdbfa9f4a5e18a8321409595c5cb049ff | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:31:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:31:31 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | be5b60fe9f251706843a6fecfc860822856a2c6b [diff] | |
| parent | 8d27ded31b48ecb567b5c328584c78e6dd2e0862 [diff] |
am 6cb9ac8e: am fb1dbac1: (-s ours) am eee501ec: am 6b940e13: Merge "adb: win32: define UNICODE/_UNICODE, Unicode error messages, misc" * commit '6cb9ac8ec9ff70ffc99ded11ab3045cc9a350877':