diff options
| author | Ying Wang <wangying@google.com> | 2015-03-20 23:14:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 23:14:09 +0000 |
| commit | e9900b7ef4dd88a5e621dc105eddfbe425a5fa42 (patch) | |
| tree | 298bf379e2d05489ab6d5907221d22778bb1e885 /gtest/COPYING | |
| parent | e95fca42a42e15717eb9afcc27b0031736ec3ffe (diff) | |
| parent | 0f36c61953ea1ba726aabb4fa81cd77b43784cb1 (diff) | |
| download | external_protobuf-e9900b7ef4dd88a5e621dc105eddfbe425a5fa42.zip external_protobuf-e9900b7ef4dd88a5e621dc105eddfbe425a5fa42.tar.gz external_protobuf-e9900b7ef4dd88a5e621dc105eddfbe425a5fa42.tar.bz2 | |
am 0f36c619: am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit '0f36c61953ea1ba726aabb4fa81cd77b43784cb1':
Diffstat (limited to 'gtest/COPYING')
0 files changed, 0 insertions, 0 deletions