OSDN Git Service

resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp...
authorNeil Fuller <nfuller@google.com>
Fri, 6 Jul 2018 17:05:44 +0000 (10:05 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 17:05:44 +0000 (10:05 -0700)
commit47d79db2b83c45a8b14bcb73240ecb5eff85d4ec
tree57a6832f8d73cfcd5b4fe2facf413611fde5ccac
parent31b10bdf90a7e8f54275247464e62b898f5b9153
parentf53c7a2ae5d2ef0a36d3021305328c78fc75d44d
resolve merge conflicts of 7980b19bc8fa1fb0c4b4b3abea891d6e245b3edd to stage-aosp-master am: 3147288c3b
am: f53c7a2ae5

Change-Id: Id591cb0be593fd6e0e742c8e323f5a9cae21c30b