commit | 832e9c0a1355e1241e15e9108abc95f8a76a28b0 | [log] [tgz] |
---|---|---|
author | Zach Jang <zachjang@google.com> | Thu Apr 21 16:10:50 2016 -0700 |
committer | The Android Automerger <android-build@android.com> | Thu Apr 21 20:14:10 2016 -0700 |
tree | 88e7630fe2dc647ff241349d668dcb9271f57751 | |
parent | e3437c49982e2e4c7fbd4219056123f3d079f868 [diff] |
Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-release Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d