| commit | 7d172f1f38fff24cc9952afe5516cd5d24a7cc38 | [log] [tgz] |
|---|---|---|
| author | Zach Jang <zachjang@google.com> | Thu Apr 21 16:10:50 2016 -0700 |
| committer | The Android Automerger <android-build@google.com> | Mon Apr 25 13:01:32 2016 -0700 |
| tree | b3e17521429cd9caec9785eef0129e41835a9da1 | |
| parent | f6cfcb0f0a08190de0b642fd5654b75ca5d77030 [diff] |
Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-release Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d