tree 4efcc3b91b5db80deedf09e7c7bb03a9468a3308
parent 4e3507d544741ba08d871a235b6ec11e1e674853
parent 3f552669e33ff046cdfbf958cd59ef061a38d303
author Tony Mak <tonymak@google.com> 1546945276 -0800
committer android-build-merger <android-build-merger@google.com> 1546945276 -0800

[automerger skipped] RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. am: d9e75a497e
am: 3f552669e3 -s ours
am skip reason: change_id Ib2ee544b5783234fba8ee2f93adf0b36b039520f with SHA1 4e3507d544 is in history

Change-Id: I71dac905e55f732d839549d15700ee6d4db537e7