| commit | a0cfb157ecf69c948e37db5a9df6cb8a8102874c | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Thu Nov 10 10:31:31 2016 +0900 |
| committer | Hugo Benichi <hugobenichi@google.com> | Thu Nov 10 10:31:31 2016 +0900 |
| tree | 51c16458599bdb307e15c92fa5008eb2c30f2d68 | |
| parent | eda0b0078e0f66a9ea3b077e7587d7dcee11e607 [diff] | |
| parent | 89aa6fb4d87b5a279150f15ad1f9bcfa03e3a261 [diff] |
resolve merge conflicts of 89aa6fb to mnc-dr-dev Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22