tree 5033e91ac716bdd1c439b7a53ea999bf7ff4ca2b
parent 07a30707cb54c2419ce9182a61cd63947dd713fc
parent 821727a0fd0fa608a3046db8dad6ea588e16828f
author Ben Lin <linben@google.com> 1468447613 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468447614 +0000

Merge "Follow up changes from ag/1190582." into nyc-andromeda-dev