| commit | c7237199bf74ffc64f2513e0f8b3c9a7f8432ab5 | [log] [tgz] |
|---|---|---|
| author | Justin Yun <justinyun@google.com> | Fri Oct 20 11:30:34 2017 +0900 |
| committer | Justin Yun <justinyun@google.com> | Fri Oct 20 11:30:34 2017 +0900 |
| tree | 8d3c7793bc08deb702dbf2b2f1088ce3440038ec | |
| parent | 0832c7d0b0a5c66c91e986a2127de67d36ec6e00 [diff] | |
| parent | 03460f6d67cc7a268a6af582f2f671fdf2e33379 [diff] |
resolve merge conflicts of 03460f6 to stage-aosp-master Test: I solemnly swear I tested this conflict resolution. Change-Id: Ib55025f8eb49089e60f7c313d9616ed23a452606