OSDN Git Service

Merge "Fix ManifestMerger issues"
authorColin Cross <ccross@android.com>
Fri, 15 Jun 2018 23:59:21 +0000 (16:59 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jun 2018 23:59:21 +0000 (16:59 -0700)
commitc5e5b64b0408477bf08246365b2d0bc3a419c268
tree2f18af5462c29be48bb7a4ee5491b5263e5521f2
parentabdaa314f885b5a889e48676b7b2b0460a5332f7
parent684b5f038bbad29373a1cee1f76b1edd7ecc97d9
Merge "Fix ManifestMerger issues"
am: 684b5f038b

Change-Id: I4a551483dd3f0093f11b557a8ee6e6a99cace256
packages/SettingsLib/Android.mk