tree 357c33447c5b263f9f95e88386a3f00464e0530d
parent 117cff790e34948e847d724be624ed2dd00bc82c
parent cc715a5b50ed5db2a553c81fcc242fa5a19daaa4
author Adrian Roos <roosa@google.com> 1460678224 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1460678226 +0000

Merge "Partial revert of c1a80b08f08cfb038625cec537390705d16db3f5" into nyc-dev