| commit | 13d685964e8d0c609d3f7dc09b088feebc896a0a | [log] [tgz] |
|---|---|---|
| author | Jae Shin <jaeshin@google.com> | Fri Sep 15 16:54:49 2017 +0900 |
| committer | repo sync platform/system/core <jaeshin@google.com> | Fri Sep 15 16:56:48 2017 +0900 |
| tree | cdbfbc1ba3091fece6c51f8f6428682d68693d68 | |
| parent | c35a3accd7c20d29aae94a208bb8156de662fca3 [diff] | |
| parent | 9414ec08188b5189eb393a2ffaa039ff1fcf6027 [diff] |
resolve merge conflicts of 9414ec081 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia6f689869563e785b70863b3026ce927ce12c478