| commit | 8dbb5e51c8419eeec8b6fcddb101fcdf40ca9f03 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed Sep 13 11:08:36 2017 +0100 |
| committer | Nicolas Geoffray <ngeoffray@google.com> | Wed Sep 13 11:08:36 2017 +0100 |
| tree | 5ab0e66df9c127ed20056cc73764928495b0948b | |
| parent | 2a4b62dd12240e7b21bec23615f59a3da41a3422 [diff] | |
| parent | e017dae5873cecf2a42f4e2709680c44fc287c88 [diff] |
resolve merge conflicts of e017dae5873c to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I7008986501028ec9bee0505d41aae3ff27872b50