| commit | bfb285b47fb81affd33f31a937734a1704efc72a | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Mon Jan 12 19:51:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 12 19:51:58 2015 +0000 |
| tree | 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25 | |
| parent | 00835d4e7e7f57aafd904e09dd6421b64032daa3 [diff] | |
| parent | 19a443e4e8bf3d37e544eda2c407604616cdae9d [diff] |
am 19a443e4: Merge "Update protobuf library from 2.3 to 2.6." * commit '19a443e4e8bf3d37e544eda2c407604616cdae9d': Update protobuf library from 2.3 to 2.6.
diff --git a/Android.mk b/Android.mk index 110117b..83d39d4 100644 --- a/Android.mk +++ b/Android.mk
@@ -64,7 +64,6 @@ LOCAL_MODULE := launcher_protoutil_lib LOCAL_IS_HOST_MODULE := true LOCAL_JAR_MANIFEST := util/etc/manifest.txt -LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-2.3.0-nano include $(BUILD_HOST_JAVA_LIBRARY)