tree eaf8bb1cc2b0e922c771fff0c200656576e754ee
parent 8ba996fa685c67fae225bd1614828810018c5e05
parent 5105ebb6883d5aa908a3f4b746ac9b5ea98eb891
author android-build-team Robot <android-build-team-robot@google.com> 1498759446 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1498759446 +0000

Merge cherrypicks of [2479290] into nyc-mr2-security-c-release

Change-Id: I8185f4300ff128d580e775f6caefec95cf074c01