diff options
author | Ying Wang <wangying@google.com> | 2014-08-20 20:57:39 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-20 20:57:39 +0000 |
commit | b09fd32de981b889f973de772a696cef47162ebf (patch) | |
tree | da27673a2cd4d5f46afe1a3506325e85fdaeb757 | |
parent | f91b7fa173d2aa76ce593c20e429bd8d480599ea (diff) | |
parent | f25e1e6bb77d583855d68c72a3bfd237a12178ab (diff) | |
download | external_protobuf-b09fd32de981b889f973de772a696cef47162ebf.zip external_protobuf-b09fd32de981b889f973de772a696cef47162ebf.tar.gz external_protobuf-b09fd32de981b889f973de772a696cef47162ebf.tar.bz2 |
am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit 'f25e1e6bb77d583855d68c72a3bfd237a12178ab':
0 files changed, 0 insertions, 0 deletions