diff options
author | Ying Wang <wangying@google.com> | 2014-05-02 04:00:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 04:00:31 +0000 |
commit | 70ef74aaa69013945b60aea5bbb3c5a7932c41d4 (patch) | |
tree | 191c1bb731c33d7d8073e7c191ae9ceac1d251b2 /src | |
parent | 3e46c9b5dae5adc46599c33f1bf6c6a972c6d1fc (diff) | |
parent | b54018a23cb7ec9b6abb9d67baeb2a5d26628a33 (diff) | |
download | protobuf-70ef74aaa69013945b60aea5bbb3c5a7932c41d4.tar.gz protobuf-70ef74aaa69013945b60aea5bbb3c5a7932c41d4.tar.bz2 protobuf-70ef74aaa69013945b60aea5bbb3c5a7932c41d4.zip |
am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit '49512cb01065b41c0113248c2c02800de1156d50':
You CANNOT change the global WITH_DEXPREOPT
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions