tree 31ef70f2676a936f7fb168321538bb7eb8b77484
parent 0ac2c09ea1097cc7d9fd5be4fe4bebc05f7bb04f
parent 36c513d8d56c12b56853ee69ebe988daf04f8ee7
author android-build-team Robot <android-build-team-robot@google.com> 1508224888 +0000
committer android-build-team Robot <android-build-team-robot@google.com> 1508224888 +0000

Snap for 4399693 from 36c513d8d56c12b56853ee69ebe988daf04f8ee7 to oc-mr1-release

Change-Id: I3aae0b2b388c4ccc9c2ea9d5b7f342677116bf93