OSDN Git Service

Merge changes If285d71a,Iffe5be7c
authorDavid Brazdil <dbrazdil@google.com>
Tue, 17 Jul 2018 10:43:13 +0000 (03:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jul 2018 10:43:13 +0000 (03:43 -0700)
commitc9b5e657473f6643ecc80586f36740cd503e50f3
treebc874507bbc85696a80ea26c24f7c2117382a8e2
parentdd540c644fc87123cc66bd98212be203d15b3adb
parentf37950d8c338968a88c39bb0efab55bc8d487191
Merge changes If285d71a,Iffe5be7c
am: f37950d8c3

Change-Id: I667c07fa75e0cc5badad3f297fc14316a2acfc42
Android.bp
Android.mk