| commit | c14edd65d9c2ad72a21b5ec8e016c30d5718ae2d | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Oct 12 16:21:08 2017 -0700 |
| committer | Chih-hung Hsieh <chh@google.com> | Thu Oct 12 23:28:31 2017 +0000 |
| tree | 972efa6b885b713fac472c88f29428f256eff10b | |
| parent | 119e93fdd71d7049ae0b11650a3d70577b622b24 [diff] | |
| parent | 74770629397134a61f7991a7e20aadc9ab6a55ef [diff] |
resolve merge conflicts of 74770629 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Exempt-From-Owner-Approval: fix merge conflict Change-Id: I7af3ed74c62c9004c17fcb080acfff7ff408945c