tree 9a7f115af255369c1d11157095e4f2cb629fbff7
parent 2dca7c82d1abb55dec399a20d3058990e9ce4b39
parent c8bb87bf4df1a1cb63a1570c74e6db8c5ec8d524
author Xin Li <delphij@google.com> 1489784026 -0700
committer Xin Li <delphij@google.com> 1489784152 -0700

Merge commit 'c8bb87bf4df1a1cb63a1570c74e6db8c5ec8d524' from
nyc-support-25.3-dev to mirror-aosp-master.

Bug: 36221697
Test: build
Change-Id: I08f556bd2d207a028ed3ae7bd1f726e46843520c