tree 8469a36988c7aa1eb46538cf4b6d561df0817a2a
parent 71fa9cdc2d2e4ca5c65d4736a4ab1e2091f488e3
author Zach Jang <zachjang@google.com> 1461280250 -0700
committer The Android Automerger <android-build@android.com> 1461297880 -0700

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

Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d