OSDN Git Service

Merge "Fix build" am: 48d2b14feb
authorColin Cross <ccross@android.com>
Tue, 23 Aug 2016 01:33:20 +0000 (01:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 01:33:20 +0000 (01:33 +0000)
commitd3855de398cb1f7e74100d9be7627543a5125513
tree9abbab933a2a2e789cc5dcfe8489807d4bc25aea
parentbebc505c79423132b701af0e88d2d79edd717f91
parent017fb2931de3246966ccb6b3f07ff9387b2930bb
Merge "Fix build" am: 48d2b14feb
am: 017fb2931d

Change-Id: I16157bf9cd750cbc0d81f133dbbe63089512604b