| commit | 71f6de410f183d27485775172cb00f9c9f59951c | [log] [tgz] |
|---|---|---|
| author | Hsin-Yi Chen <hsinyichen@google.com> | Fri Aug 18 19:14:58 2017 +0800 |
| committer | Hsin-Yi Chen <hsinyichen@google.com> | Fri Aug 18 19:14:58 2017 +0800 |
| tree | 33d271e937c2ffc40dbc2e5d4a0298283cd30303 | |
| parent | 78bd7eb0328e5c343d7da8d4c9c1bdea769c4d01 [diff] | |
| parent | 6c8cab1159aecddabfc3ae5f4175a35f1d352481 [diff] |
resolve merge conflicts of 6c8cab115 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia4e5e019093b17ef407864ea97d73b1f6e613e8c