tree e1df0fbd9e8dc71cc4c5353eac6638a71d71f0b1
parent edb16b0f4bbc667c36f801f7614757e2411d5670
parent 47ef64b0d2ca41f879facbfb278a7d14c3b9577b
author Lorenzo Colitti <lorenzo@google.com> 1518695009 +0000
committer android-build-merger <android-build-merger@google.com> 1518695009 +0000

Merge changes Icd56662d,I0ece820f
am: 47ef64b0d2

Change-Id: Ifd2ffe68cfff511d010ce5e755b4b680ad1df52c