summaryrefslogtreecommitdiffstats
path: root/core/java/android/text/Html.java
diff options
context:
space:
mode:
authorTsuwei Chen <tsuwei@google.com>2014-09-16 08:42:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-16 08:42:47 +0000
commit50fa67bd15e6626e9c135bc788ce78a1771d7a78 (patch)
tree8d68d4796759f849e9bb315ea158015ea1101e78 /core/java/android/text/Html.java
parentbff16debdcb3e15b30f50f6f806e166fce85a178 (diff)
parentdc524b714ee67dcd1aca42c49125f443f0e8f699 (diff)
downloadframeworks_base-50fa67bd15e6626e9c135bc788ce78a1771d7a78.zip
frameworks_base-50fa67bd15e6626e9c135bc788ce78a1771d7a78.tar.gz
frameworks_base-50fa67bd15e6626e9c135bc788ce78a1771d7a78.tar.bz2
am 86f1d252: Merge "Set user agent for XTRA download according to carrier specification. Bug: 17056380 Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7" into lmp-dev
* commit '86f1d252e22a68b9fa24da01ab5bd159e4470bb3': Set user agent for XTRA download according to carrier specification. Bug: 17056380 Change-Id: Iacb90d4780f35fa6875702889d4a5f02610768b7
Diffstat (limited to 'core/java/android/text/Html.java')
0 files changed, 0 insertions, 0 deletions