| commit | 2399a9279f0e6a1be1f9e8de9044abf28a0a727d | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Mon Jun 29 17:07:33 2015 -0700 |
| committer | Filip Gruszczynski <gruszczy@google.com> | Mon Jun 29 17:07:33 2015 -0700 |
| tree | b010251f8197f5db7bcd1a6f0f39edba0226efeb | |
| parent | c4c239bfe5e50b7b0cdebfdb64172b4da8198828 [diff] | |
| parent | e89d821e33fd2166f5ba58f63362d05790004e39 [diff] |
resolved conflicts for merge of e89d821e to mnc-dev Change-Id: I3dea6a0947df26b99a779979d68f018d1ad678dc