Merge remote-tracking branch 'remotes/upstream/master' into beta

[pub/Android/ownCloud.git] / libs / android-support-appcompat-v7-exploded-aar / res / layout / notification_template_media.xml

diff --git a/libs/android-support-appcompat-v7-exploded-aar/res/layout/notification_template_media.xml b/libs/android-support-appcompat-v7-exploded-aar/res/layout/notification_template_media.xml
index 90daa88..060dbb0 100644 (file)
--- a/libs/android-support-appcompat-v7-exploded-aar/res/layout/notification_template_media.xml
+++ b/libs/android-support-appcompat-v7-exploded-aar/res/layout/notification_template_media.xml
@@ -50,3 +50,4 @@
         android:layout_height="match_parent"
         />
 </LinearLayout>
+<!-- From: file:/usr/local/google/buildbot/src/googleplex-android/mnc-supportlib-release/frameworks/support/v7/appcompat/res/layout/notification_template_media.xml -->
\ No newline at end of file