| commit | 5e4c382d15968c757fb9c5783cbd420156ea8ad2 | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Mon Jun 08 15:00:25 2015 -0700 |
| committer | Filip Gruszczynski <gruszczy@google.com> | Mon Jun 08 15:00:25 2015 -0700 |
| tree | 0cd19986c7b6165d6b5a4a6dad9005fa572ed5bd | |
| parent | e37cf3b8d614019c5570f945110bfbc5a8b09713 [diff] | |
| parent | 17ba2e6c49b62c8763895aa6b81ffc06d7f3bc34 [diff] |
resolved conflicts for merge of 17ba2e6c to mnc-dev Change-Id: I9177f0e994e1e8fba02faf5a13f2dcec950ec5e0