tree 091c20745f59ef628656e8b2c65a74e0d8d2d088
parent 24f88ae7cf176363315a38b0e02fdb2565f30481
parent a54a1ab7f572e723d280428ca806beb12e598b13
author Hall Liu <hallliu@google.com> 1501180919 +0000
committer android-build-merger <android-build-merger@google.com> 1501180919 +0000

Merge "Fix "Emergency Information" text overflow" into oc-dr1-dev
am: a54a1ab7f5

Change-Id: I819340bbffd1a3c185b767ff3cbef12ac88c3174