| commit | a03e8e4a341ff15df23da0a9a468596f43d3bff7 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Jun 07 11:57:02 2017 -0700 |
| committer | Wei Jia <wjia@google.com> | Wed Jun 07 12:01:21 2017 -0700 |
| tree | c6005f2e3f4880dd973425e80a7f873beea26c60 | |
| parent | 69e74309070a9b4ebb572cb3f02a96af8d282142 [diff] | |
| parent | 6dabee4a94e3bb9eb9eaaf1b99071999a5a3a020 [diff] |
resolve merge conflicts of 6dabee4a94 to mnc-dev Test: this test passes Bug: 34031018 Change-Id: I76ac929d7cca256e9d7b73b26d0f5159bae1ef7d