tree 6a6f30f757a2fe92e80b2a6a2437789ee014471c
parent 2cfc752278cc564d516f95a4475ba279fc54b562
parent 3ccbf6ab60d5238d834c57183bb4821df06cb022
author Andrew Solovay <asolovay@google.com> 1501263203 +0000
committer android-build-merger <android-build-merger@google.com> 1501263203 +0000

Merge "Merge "Cherry-pick from master: AAPT2: Fix JavaDoc first sentence extraction." into oc-mr1-dev am: aa6f03639a" into oc-mr1-dev-plus-aosp
am: 3ccbf6ab60

Change-Id: I218cb00eecab6da00f216758387167a698ca041b