diff options
author | Ying Wang <wangying@google.com> | 2014-08-21 02:47:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 02:47:17 +0000 |
commit | 0f36c61953ea1ba726aabb4fa81cd77b43784cb1 (patch) | |
tree | 298bf379e2d05489ab6d5907221d22778bb1e885 /.gitignore | |
parent | 682363bcf6addd6cdb822bc0fed5cd724ffe957d (diff) | |
parent | b09fd32de981b889f973de772a696cef47162ebf (diff) | |
download | external_protobuf-0f36c61953ea1ba726aabb4fa81cd77b43784cb1.zip external_protobuf-0f36c61953ea1ba726aabb4fa81cd77b43784cb1.tar.gz external_protobuf-0f36c61953ea1ba726aabb4fa81cd77b43784cb1.tar.bz2 |
am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
* commit 'b09fd32de981b889f973de772a696cef47162ebf':
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions