| commit | 91e5b0f598f19499e55dcb8f0243b430e3c1ee4f | [log] [tgz] |
|---|---|---|
| author | Filip Gruszczynski <gruszczy@google.com> | Fri May 22 00:02:47 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 22 00:02:48 2015 +0000 |
| tree | de7adfc416faffc9c0c02e504f2ca62917a140e1 | |
| parent | e4b47614b7f07dedabe316b5263ec37249ce9c15 [diff] | |
| parent | c7becb7ee78881646251ff4846e63eb6b96bf7ec [diff] |
Merge "resolved conflicts for merge of 47249f2a to mnc-dev" into mnc-dev