Merge pull request #456 from xfxyjwf/android

Remove Android.mk

Merge pull request #456 from xfxyjwf/android
Remove Android.mk
60c510a3 · Jisi Liu · 96f1d4ad · b866d3c7 · 96f1d4ad · 60c510a3
Commit 60c510a3 authored Jun 04, 2015 by Jisi Liu
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

Android.mk Android.mk +0 -0

LICENSE LICENSE +0 -2

No files found.
--- a/Android.mk
+++ b/Android.mk
--- a/LICENSE
+++ b/LICENSE
@@ -8,8 +8,6 @@ This license applies to all parts of Protocol Buffers except the following:
    src/google/protobuf/stubs/atomicops_internals_aix.h.
    This file is copyrighted by Bloomberg Finance LP.

-  - Andorid.mk, which is copyrighted by The Android Open Source Project.
-
 Copyright 2014, Google Inc.  All rights reserved.

 Redistribution and use in source and binary forms, with or without