tree 1b7c866073c3a8304d66c8cc465d235fdcb56413
parent 9c1d1a31b1a85f2fc484db07c46b4f7d28576bed
parent 71bd138fb58cf62efb5a8d9e9c242fe2d367f0cd
author android-build-team Robot <android-build-team-robot@google.com> 1507188587 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1507188587 +0000

Snap for 4378450 from 71bd138fb58cf62efb5a8d9e9c242fe2d367f0cd to oc-mr1-release

Change-Id: Ie0e4179fcd67d81533df91d1af3b53705a5c69b8