| commit | fa6595001a94f6d5cf5fb58385eb90464345443f | [log] [tgz] |
|---|---|---|
| author | Steve Muckle <smuckle@google.com> | Mon Aug 14 13:00:27 2017 -0700 |
| committer | Steve Muckle <smuckle@google.com> | Mon Aug 14 13:00:27 2017 -0700 |
| tree | 9b736b78113aa943e93472fccb63ece08a479ece | |
| parent | 8191dfb49e8c8141726f04508f24f4c0fed9ed79 [diff] | |
| parent | b145b041275032d604b56da84ae909c58e04105b [diff] |
resolve merge conflicts of b145b04127 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ice4e7c23c5a6e0ba4aa085e82c121d472f89209a