| commit | 0f570c4fcb63b52f1192a4f4f41de17bbabd19c0 | [log] [tgz] |
|---|---|---|
| author | Jiyong Park <jiyong@google.com> | Wed Jun 28 14:28:26 2017 +0900 |
| committer | Jiyong Park <jiyong@google.com> | Wed Jun 28 05:55:43 2017 +0000 |
| tree | 61529c596d6dad8cd3eafd056adb2de3c4400ea2 | |
| parent | 7428e42f334facd5b9123fabd0b66b005684d849 [diff] | |
| parent | fd654748a029c6785dd1da1be519f83ba1c8e8b4 [diff] |
resolve merge conflicts of 20d9cf2ee to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Merged-In: If8fc73e4ae4c2f8281c41a12f1c18079aab8baa2 Change-Id: Ie7feb839c9da2a11579ed850680c044c9fc3432a