OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE Prevent stack overflow in btif_storage"...
authorandroid-build-team Robot <android-build-team-robot@google.com>
Fri, 4 May 2018 02:07:11 +0000 (19:07 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 4 May 2018 02:07:11 +0000 (19:07 -0700)
am: 5ad7aced6d  -s ours

Change-Id: I1f677cd1647c6ff282a4eb0a254aee647385ca60


Trivial merge