OSDN Git Service

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

Change-Id: Id3efe319a6c75dd1d8fafc92104caf2f2c956a75