summaryrefslogtreecommitdiffstats
path: root/assets
diff options
context:
space:
mode:
authorWalter Jang <wjang@google.com>2016-03-28 16:22:16 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-03-28 16:22:16 +0000
commita5ad90e015333151d87395f5135c4539913c125d (patch)
treec1c1526dc9551bc56ad4214e3b8266fb45a8f2a6 /assets
parenta86ef6e15a776571ccc3c9a024b5c8b43478a148 (diff)
downloadpackages_apps_Contacts-a5ad90e015333151d87395f5135c4539913c125d.tar.gz
packages_apps_Contacts-a5ad90e015333151d87395f5135c4539913c125d.tar.bz2
packages_apps_Contacts-a5ad90e015333151d87395f5135c4539913c125d.zip
DO NOT MERGE reset ub-contactsdialer-b-dev to ub-contactsdialer-master-dev am: 29bd2ee -s ours
am: be04b86 -s ours * commit 'be04b86791693f518f3c4a8ace3f51ad676501dd': DO NOT MERGE Test if ProfileAndContactsLoader before taing experiment code paths Import translations. DO NOT MERGE
Diffstat (limited to 'assets')
-rw-r--r--assets/licenses.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/assets/licenses.html b/assets/licenses.html
index 690d0af96..c24ed6306 100644
--- a/assets/licenses.html
+++ b/assets/licenses.html
@@ -6,7 +6,7 @@
</head>
<body>
-<h3>Notices for: guava and libphonenumber</h3>
+<h3>Notices for: guava, libphonenumber, and libprotobuf-java-nano</h3>
<pre>
Apache License
Version 2.0, January 2004