commit a61515720ab95f6aa307c1fa4337c5c2078bad26
author Wale Ogunwale <ogunwale@google.com> Tue Oct 27 15:12:56 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 27 15:12:56 2015 +0000
tree b731d7e77be862a0f781bc6d03868adbab915896
parent 40b52bbe480436fbdc3bfb8a1a70c6144e71ff8f
parent 8f0555ac556266c52b5a52bb501ce00f36317696

Merge "[ActivityManager] Fix IndexOutOfBoundsException"

Android.mk

diff --git a/Android.mk b/Android.mk
index 7df1bd7..932723b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -679,7 +679,7 @@
 # Common sources for doc check and api check
 common_src_files := \
 	$(call find-other-html-files, $(html_dirs)) \
-	$(addprefix ../../libcore/, $(libcore_to_document)) \
+	$(addprefix ../../, $(libcore_to_document)) \
 	$(addprefix ../../external/junit/, $(junit_to_document))
 
 # These are relative to frameworks/base

packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java

diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
index af7ee08..9f7e8ec 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenFooter.java
@@ -140,6 +140,7 @@
 
     public void onConfigurationChanged() {
         mSpTexts.update();
+        Util.setText(mEndNowButton, mContext.getString(R.string.volume_zen_end_now));
     }
 
 }