| commit | c7becb7ee78881646251ff4846e63eb6b96bf7ec | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Wed May 20 20:11:39 2015 -0700 |
| committer | Filip Gruszczynski <gruszczy@google.com> | Wed May 20 20:15:29 2015 -0700 |
| tree | a42141a24ea950f26b21faf95157f8f2513f66d3 | |
| parent | 8562b08f04c1309cf40db1e749d612b6824f1d12 [diff] | |
| parent | 47249f2a9e49aa9626369517315eafc6b42fd8e9 [diff] |
resolved conflicts for merge of 47249f2a to mnc-dev This is a merge of chin support. Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635