tree e9b22a800adac878aa4d9b60311c9ee66fa23c14
parent 63bb0ba479726b9f41c30416b4747a2ecff21c8d
parent c1ebd50044a5f4590842d4dfc96d3e31305adad2
author android-build-team Robot <android-build-team-robot@google.com> 1508311511 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508311511 +0000

Snap for 4402249 from c1ebd50044a5f4590842d4dfc96d3e31305adad2 to oc-mr1-release

Change-Id: Iccdfbf3b154aa931a9d684f9595a724938b4ead3