OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing...
authorAjay Panicker <apanicke@google.com>
Fri, 11 May 2018 22:45:35 +0000 (15:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 22:45:35 +0000 (15:45 -0700)
commitbb23eb3dafe3e4577c711b9d70028ad20d946266
tree32389374282a67cf1a26ce141dd6d7f5c2c24e13
parentb95cde527986aa0dee398074f01f4f8a8a2b9dc5
parent4a6c4b0c64262cb095da9764815410f3341e40a3
[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing to a buffer" into oc-dev am: 2f9f6adfed am: aded757078
am: 4a6c4b0c64  -s ours

Change-Id: I979219abffdf2fa7e851dcc326931c1c25d219fa