OSDN Git Service

Merge "Removing contents hidden string for public notifications" into oc-dr1-dev...
authorSelim Cinek <cinek@google.com>
Sun, 23 Jul 2017 13:04:49 +0000 (13:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 23 Jul 2017 13:04:49 +0000 (13:04 +0000)
commit137123bdefe94cc1c35496f87a7b917af8189360
tree37f03336496725370d5a087b0cf13be7444995a5
parente6eba20c1519e710b9e029f6392d30cdb4ecda83
parent001956c626c8c2c8c02c6065ea0964dd505e5406
Merge "Removing contents hidden string for public notifications" into oc-dr1-dev am: 8650c7c0f1
am: 001956c626

Change-Id: Ic1c65063fce8cea01b01569cba6181f4465cd88e
core/java/android/app/Notification.java
core/res/res/values/strings.xml
core/res/res/values/symbols.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java