| commit | 48fe2631373931d8ab4a403791dd09394519acf6 | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Mon Jun 01 09:23:14 2015 -0700 |
| committer | Filip Gruszczynski <gruszczy@google.com> | Mon Jun 01 09:23:14 2015 -0700 |
| tree | 2d962d89943803e8f2d1b6c7cb8ec494e7ffd6e6 | |
| parent | 3aa33b3da04774d76e1a65b749667450dc81532b [diff] | |
| parent | a61e23f13b970f68c98934d3ec1569a481ddc567 [diff] |
resolved conflicts for merge of a61e23f1 to mnc-dev Change-Id: Ief5ad11d4f97ae6dbe2d26420550dd145811becc