OSDN Git Service

Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev
authorAdam Lesinski <adamlesinski@google.com>
Wed, 18 Oct 2017 00:57:26 +0000 (00:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Oct 2017 00:57:26 +0000 (00:57 +0000)
commitf60d30b6829b84223c680b7b6f9669975c708a27
tree6f814f8c62c11a128af5b1c28c53a0bf1d247ed9
parenta3edc551c0b7873f5843b3b1dda89b20ae74f950
parent3bdfe1a2517c4e2b6e9c7b7fe6b91eff77e4bd00
Merge "AAPT2: Flatten AndroidManifest.xml stringpool in UTF16" into oc-mr1-dev
am: 3bdfe1a251

Change-Id: I3295e61dcf29a7cb242b4ee0017f2fd94a0cfd65