| commit | 227fe277bfc62a2e138744a35ba1db411e998e99 | [log] [tgz] |
|---|---|---|
| author | sqian <shuoq@google.com> | Tue Jul 18 13:42:40 2017 -0700 |
| committer | sqian <shuoq@google.com> | Tue Jul 18 14:12:10 2017 -0700 |
| tree | 87c75529a1399fa7b9b8b5788a1679d1460635ce | |
| parent | 49abbfdd68f8c3ab797fd046552dfbf18ffb1993 [diff] | |
| parent | 6ecc54a7ad1d804baeffe5a8f546f9411a35a160 [diff] |
resolve merge conflicts of 6ecc54a7 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I369fe9aacf37dcea6225b5e5a658159dfb859ad0