commit | 5599fa540bfcbde583f1260de97d4edc0a8f6b1d | [log] [tgz] |
---|---|---|
author | Marco Nelissen <marcone@google.com> | Mon Feb 13 14:19:40 2017 -0800 |
committer | The Android Automerger <android-build@android.com> | Tue Feb 21 17:21:51 2017 -0800 |
tree | a3b04b50b4c41a2e7df1af7f1f27af1662890e08 | |
parent | 4a57f24c6610917937f996d48cbf6fbf64f6f2b2 [diff] |
resolve merge conflicts of 79cf158c51 to mnc-dev Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643 (cherry picked from commit 50358a80b1724f6cf1bcdf003e1abf9cc141b122)