tree 24bcf3ff48b4314934fcb5513ce95ce561747670
parent 667251b58ffbf0948855f486c94824e9d57a2fb0
parent f2c115324243f27d83c1a7aa52e9ef7085883fdf
author Android Build Merger (Role) <android-build-merger@google.com> 1498187321 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1498187322 +0000

Merge "Merge "Add apksigner tool to Android O SDK build-tools" into oc-dev am: 9e87e29dc8 am: e2a21d64db" into oc-dr1-dev-plus-aosp