| commit | 0c57cf16ee00e68efff4932100459a45d0dec256 | [log] [tgz] |
|---|---|---|
| author | Hugo Benichi <hugobenichi@google.com> | Fri Jul 14 07:25:51 2017 +0900 |
| committer | Hugo Benichi <hugobenichi@google.com> | Fri Jul 14 07:25:51 2017 +0900 |
| tree | 5ca6813bce9e2f3cedec0987de1759ca40af1f54 | |
| parent | 9ad55e3591e6ae6e5fa263c376ce73067b8ddbde [diff] | |
| parent | ce7b23c48873a6af2c162e0e28a759676db1fb96 [diff] |
resolve merge conflicts of 4f2a0fe213e5 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031