| commit | 4954aff536d4fcf163f410fa83fca30dc9fde4ca | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Tue Jun 30 15:19:32 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 30 15:19:37 2015 +0000 |
| tree | c55773d8cab26b33fe35091dd1f56b73d4c5fae7 | |
| parent | 3188574c14c479a2898e5251b6b01db6be007975 [diff] | |
| parent | 2399a9279f0e6a1be1f9e8de9044abf28a0a727d [diff] |
Merge "resolved conflicts for merge of e89d821e to mnc-dev" into mnc-dev