tree 4b9be7bd71a56caf18b724fa7764950eeb4ffff5
parent 0e6d79856a4c73525b3f42733645a3efb1803150
parent 91e3891eed3d63e9c61b89f08d0da7b1adb02519
author Xin Li <delphij@google.com> 1555001113 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1555001113 +0000

Merge changes Ieddc1113,Ia12217b3

* changes:
  Sync with upstream up to revision 76844b29, important fixes:
  Merge in history of import from 9131ba637f003fb5894e3f6343a27d6322205f18.