OSDN Git Service

Merge "Fix build"
authorColin Cross <ccross@android.com>
Tue, 23 Aug 2016 01:30:26 +0000 (01:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 01:30:26 +0000 (01:30 +0000)
commit017fb2931de3246966ccb6b3f07ff9387b2930bb
tree9abbab933a2a2e789cc5dcfe8489807d4bc25aea
parent441ee4006ab84834114554aca49a57302ebcb7de
parent48d2b14feb749c9160eb4af3e870ed935a1c6455
Merge "Fix build"
am: 48d2b14feb

Change-Id: I545501b86800329f2540b25a35cf1473f36e9076