OSDN Git Service

Merge "Fix build break from merge conflict" am: c13fbeb220
authorMathieu Chartier <mathieuc@google.com>
Wed, 5 Oct 2016 00:59:31 +0000 (00:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Oct 2016 00:59:31 +0000 (00:59 +0000)
commit9d2b9cb0e8ffb70be2415d0d1c69763934309cf4
tree8531ef73e7495c073d5780d8999952609f9e404c
parent12238c82cb3bcb3721928970a490c841f8d8bfb7
parentdfd6e355c90642a1577185a1ff1cf5ea60088dd1
Merge "Fix build break from merge conflict" am: c13fbeb220
am: dfd6e355c9

Change-Id: I9c545e3851b8d83807ce11774cfbf7efa833a653