OSDN Git Service

[automerger skipped] Merge "Trim away some dead code" am: d6a1657466 -s ours
authorNeil Fuller <nfuller@google.com>
Thu, 21 Jun 2018 23:20:34 +0000 (16:20 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Jun 2018 23:20:34 +0000 (16:20 -0700)
am: d85b36fde3  -s ours

Change-Id: I5b9006099a564fe8de1811e1254a3859ef3449d4


Trivial merge