commit c128cba822783ec15508dd14579baf9478787a7d
author Richard Uhler <ruhler@google.com> Thu Oct 22 19:07:59 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 22 19:07:59 2015 +0000
tree 90c9c98e6b43cb14eabe12eae33040551fe9ea33
parent 9f9165b1b84d9835cf4696a2c3a8a4ae68478931
parent be5c72b055a52b1918a928a2f4d3e8df1a10cd73

Merge "Update perflib prebuilt to studio-1.4."

common/perflib/PREBUILT

diff --git a/common/perflib/PREBUILT b/common/perflib/PREBUILT
index a518115..bb6552e 100644
--- a/common/perflib/PREBUILT
+++ b/common/perflib/PREBUILT
@@ -1,5 +1,5 @@
 The object in this prebuilt directory can be rebuilt from
 	platform/tools/base/perflib
 
-From the commit 8107ce21fd87d0c56a1155a1e83ee63187bd29d4
+From the commit 47b1ef19c951a661ab86c7d4c9c0626757e09067 (studio-1.4)
 

common/perflib/perflib-prebuilt.jar

diff --git a/common/perflib/perflib-prebuilt.jar b/common/perflib/perflib-prebuilt.jar
index 4590f59..17bb351 100644
--- a/common/perflib/perflib-prebuilt.jar
+++ b/common/perflib/perflib-prebuilt.jar
Binary files differ