commit | 69127072c4d6f812ab44c9c1de9e44116ba5a614 | [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 21:04:40 2016 -0700 |
tree | 8469a36988c7aa1eb46538cf4b6d561df0817a2a | |
parent | 71fa9cdc2d2e4ca5c65d4736a4ab1e2091f488e3 [diff] |
Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-release Change-Id: I079d1db2d30d126f8aed348bd62451acf741037d