tree 7c83ecefb489f41b7ce2bf70fb8393408286401f
parent 06e1d236ab644fa64bb72a8d52e9a67637583ed2
parent ebc2432cfd6384117c71aa690aedfbc9be3552e1
author Haibo Huang <hhb@google.com> 1588221110 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1588221110 +0000

Merge changes Ic6edfa30,If50d6e0f into ndk-release-r21

* changes:
  Revert "Merge "Merge cherrypicks of [1298291, 1298292, 1299133, 1299134, 1299135, 1299136, 1299137, 1299138, 1299139, 1299140, 1299141, 1299142, 1299143, 1299084] into ndk-release-r21" into ndk-release-r21"
  Revert "Merge changes Ide36f188,I86bb8e0a into ndk-release-r21"