tree 228585bff8d0e8418a20fc07b8bcbcce7ce4555d
parent a89676e41c033eaeb966899c067d7f9010000dfc
parent 860fc25e85a105ef1fa9de717bb974231fab80ba
author Chih-Hung Hsieh <chh@google.com> 1520889823 -0700
committer Chih-Hung Hsieh <chh@google.com> 1520889823 -0700

Merge commit 860fc25e85a

* upstream svn@326827

Test: git diff 860fc25e85a == git diff 53df1a5045 1c4bd6a333
Change-Id: I4af60289c0e56604f06799c21afe08c099641b6b