tree 88e7630fe2dc647ff241349d668dcb9271f57751
parent e3437c49982e2e4c7fbd4219056123f3d079f868
author Zach Jang <zachjang@google.com> 1461280250 -0700
committer The Android Automerger <android-build@android.com> 1461294850 -0700

Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-release

Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d