Nicolas Geoffray 8dbb5e51c8 resolve merge conflicts of e017dae587 to stage-aosp-master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7008986501028ec9bee0505d41aae3ff27872b50

2017-09-13 11:08:36 +01:00

..

android

resolve merge conflicts of e017dae587 to stage-aosp-master

2017-09-13 11:08:36 +01:00

google/android

…