commit 2c7c8acfd90890daddca37aa6dfc1f4410c03222
author Narayan Kamath <narayan@google.com> Tue Jan 06 10:16:16 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 06 10:16:16 2015 +0000
tree 5da34623957495242493c58604bf68397e2f5340
parent 49fb8fa27a6b5e8edb52e1d44efcae13a38a0596
parent 7dd13b940b7ffc3041d09e5d6eb13e5ba50890c1

am 7dd13b94: Merge "Revert "Rename libphonenumber-unbundled to libphonenumber.""

* commit '7dd13b940b7ffc3041d09e5d6eb13e5ba50890c1':
  Revert "Rename libphonenumber-unbundled to libphonenumber."

Android.mk

diff --git a/Android.mk b/Android.mk
index 0c0e0ae..1464a47 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,7 +51,9 @@
 
 # For unbundled use, supports gingerbread and up.
 include $(CLEAR_VARS)
-LOCAL_MODULE := libphonenumber
+# TODO: Rename to libphonenumber once dependencies have been
+# renamed.
+LOCAL_MODULE := libphonenumber-unbundled
 LOCAL_MODULE_TAGS := optional
 LOCAL_SRC_FILES := $(libphonenumber_src_files)
 LOCAL_JAVA_RESOURCE_DIRS := $(libphonenumber_resource_dirs)