| commit | dc97d46e145ce96497be824337fcf88e13b3ee1d | [log] [tgz] |
|---|---|---|
| author | Jae Shin <jaeshin@google.com> | Fri Sep 15 16:38:17 2017 +0900 |
| committer | repo sync platform/system/core <jaeshin@google.com> | Fri Sep 15 16:50:34 2017 +0900 |
| tree | cf0e219b9669abdccc55af82ca7a750975921b58 | |
| parent | 6e5ef905761f43941180ce2903a562525488dcb6 [diff] | |
| parent | c265ac08ff073c09689640739ecf7e4a36346c48 [diff] |
resolve merge conflicts of 0dd4b6aa3 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ia163118a25cfc2e079803c230d69e55357acd3fa