am 5a1f6fb4: Merge "Use &#39; for apostrophe in HTML encoding"
am 5a1f6fb4: Merge "Use &#39; for apostrophe in HTML encoding"

* commit '5a1f6fb4073ee4b27359faa950808a6eeac33a4c':
  Use &#39; for apostrophe in HTML encoding

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base