| commit | fc66de023fb31bca739ede1ab5edfbe8799d30ba | [log] [tgz] |
|---|---|---|
| author | Esteban Talavera <etalavera@google.com> | Mon May 18 19:10:56 2015 +0100 |
| committer | Esteban Talavera <etalavera@google.com> | Mon May 18 19:10:56 2015 +0100 |
| tree | 4445ef75c1a2575a9bcddcf7331c89fc6f2d0963 | |
| parent | bb1bdc978a39c2be30c24a8eee41727f8123b242 [diff] | |
| parent | aa53ffbc5c5e1e13d1bc4d05af456a568fc3b37c [diff] |
resolved conflicts for merge of aa53ffbc to mnc-dev Change-Id: I4ed8328d7b465f3dc4aeb5682f84c92d0d71c921