OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing...
authorAjay Panicker <apanicke@google.com>
Fri, 11 May 2018 23:15:42 +0000 (16:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 23:15:42 +0000 (16:15 -0700)
am: bb23eb3daf

Change-Id: I1d3a9f2c40c9df267b7adf2f47e8fb5ddc4ce3c7


Trivial merge