| commit | 19a443e4e8bf3d37e544eda2c407604616cdae9d | [log] [tgz] |
|---|---|---|
| author | Jeff Davidson <jpd@google.com> | Mon Jan 12 19:37:46 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jan 12 19:37:47 2015 +0000 |
| tree | bfb3d9a16233c9577a81720fab04143a31bacb10 | |
| parent | 3e4c4987309b8cf76f524396738bfd75dd137498 [diff] | |
| parent | 77c7d302a3703dc51e2e07dc08cd6c6414d824f3 [diff] |
Merge "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)