summaryrefslogtreecommitdiffstats
path: root/core/java/android/text/SpannedString.java
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2015-02-06 17:52:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-02-06 17:52:57 +0000
commit0b1b82473d78b0887fe8b22d30812d0d2b7b6338 (patch)
tree161155ab76c17c0762eacb3e078dc9b2e1df4649 /core/java/android/text/SpannedString.java
parentd22517a7084fd3a56f22490b405c002086dc14ac (diff)
parentc63efbd928cc14e32fe19b2dec41d15ffc584182 (diff)
downloadframeworks_base-0b1b82473d78b0887fe8b22d30812d0d2b7b6338.zip
frameworks_base-0b1b82473d78b0887fe8b22d30812d0d2b7b6338.tar.gz
frameworks_base-0b1b82473d78b0887fe8b22d30812d0d2b7b6338.tar.bz2
am 022cf57f: am a08934cf: am f789d45b: Merge "Avoid static initialization of Layout from TextUtils" into lmp-mr1-dev
automerge: c63efbd * commit 'c63efbd928cc14e32fe19b2dec41d15ffc584182': Avoid static initialization of Layout from TextUtils
Diffstat (limited to 'core/java/android/text/SpannedString.java')
0 files changed, 0 insertions, 0 deletions