OSDN Git Service

Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4 -s ours
authorXin Li <delphij@google.com>
Thu, 7 Dec 2017 15:23:18 +0000 (15:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Dec 2017 15:23:18 +0000 (15:23 +0000)
commita038fb9044f7ea86bd79737579e227fdfe3aeb6e
tree6bcffc7b75af3ac765d2ee2bac8729ebbca04a04
parent82c94efa69752fbcad91458f9f01f2a6966c0a84
parent4f83509810b4ead1e48af0156f91ed7ce5fc2db8
Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: cb1056f9b4  -s ours
am: 4f83509810

Change-Id: I72dd8e97a660beaca9343cea99ef117a202fdf35