| commit | a2375bdc9f97ef50ad26ddc1e95ce9bbfbec1210 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Feb 18 10:52:31 2016 -0800 |
| committer | Roshan Pius <rpius@google.com> | Thu Feb 18 11:20:01 2016 -0800 |
| tree | 4bbc15e716979131a10c5b1adfc51d6acfef6297 | |
| parent | e5048be9b96c84659631fd5a95a2c80242df859d [diff] | |
| parent | 4bee869e0d5f85c43aca900db93004f7259ccbf9 [diff] |
resolve merge conflicts of 4bee869e0d to mnc-dr1.5-dev Change-Id: Iffc3434864cc198fe2bd9e8b95162aa775624e36