| commit | 24058e96b3e1b13ae6636826f0a4cd1cd631e8ec | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Mon Feb 13 23:13:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Feb 13 23:13:36 2017 +0000 |
| tree | 5cf57150462d325b4ff723d64ee883591fa10552 | |
| parent | e1b8152064df82d8f7afb026479ee87f534388cb [diff] | |
| parent | 86d5e962ce26dde45d961836f0926f86e4ac788c [diff] |
resolve merge conflicts of 79cf158c51 to mnc-dev am: 50358a80b1 am: 86d5e962ce Change-Id: I59f1dc2a12d44018e3e8b74bcc6d9c775f896381