tree f0844606916f78c04466cd9e0a05f1b7edd992c0
parent 0e61088fdc9fa2bccab8b6f691440f7159e810a8
parent 924045b63afc2654464f0dd41de35b07fe27debe
author android-build-team Robot <android-build-team-robot@google.com> 1507188603 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507188603 +0000

Snap for 4378450 from 924045b63afc2654464f0dd41de35b07fe27debe to oc-mr1-release

Change-Id: Iaaa056fee32220eabde462eacfb34837ffcce4bd