OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: Check number of attributes before writing...
authorAjay Panicker <apanicke@google.com>
Sat, 12 May 2018 00:22:03 +0000 (17:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 12 May 2018 00:22:03 +0000 (17:22 -0700)
am: a4f69c41f7  -s ours

Change-Id: Ia2fe73e29cf9255a372dc1bcde32e37ddd85919a


Trivial merge