tree 79b3066b11a8613e65e1b73684ff48b0c0b8e774
parent df1bee15b33396ba95ccf16adf05de83bd53a36a
parent 1871011cb164b26cf621960cf95dc1eeb0917807
author Android Build Merger (Role) <android-build-merger@google.com> 1493950719 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493950725 +0000

Merge "Merge "Hyphenate text in CheckedTextView" into oc-dev am: 801fc5de50" into oc-dev-plus-aosp