commit | 8dd6b2ff0b68782615b337ba6ebe48f39afef00b | [log] [tgz] |
---|---|---|
author | Hugo Benichi <hugobenichi@google.com> | Thu Nov 10 10:31:31 2016 +0900 |
committer | Feng Yu <feny@google.com> | Wed Nov 16 22:38:04 2016 +0000 |
tree | ccfbc2f45dc521c67ac99ec8199523136c9fccde | |
parent | ffca4506fdc4d4946bd20318f003cb09c3e03a49 [diff] |
resolve merge conflicts of 89aa6fb to mnc-dr-dev Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22 (cherry picked from commit a0cfb157ecf69c948e37db5a9df6cb8a8102874c)