| commit | cb583bba3133319dd680f65a1f623532c0531fba | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Wed Jul 01 17:03:02 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jul 01 17:03:03 2015 +0000 |
| tree | 74744a31f6e175d775560e90cf897a1efec4d60f | |
| parent | e57850149166aac5390cb50cabfc01f41ddc2ef1 [diff] | |
| parent | f05bd824665b2e6b1d952178e7ffdbe5346d6a31 [diff] |
Merge "resolved conflicts for merge of 300ccf4a to mnc-dev" into mnc-dev