commit | 918ef5814d23a647b6c717668eca71dc2488c7f5 | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:51:27 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:27 2015 +0000 |
tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
parent | 45c9fd49b5a7dbd2fc2cb1a6f7b46f1caa6cd4d1 [diff] | |
parent | d0755eb386bc28a16ec6f8aab113dc4050bd5abe [diff] |
am 08fe47e3: (-s ours) am c6195530: am db3492cf: Merge "win32: adb_test/libbase_test fixes" * commit '08fe47e3bdc3c119c37539da9b013bd6510b0fa7':