OSDN Git Service

[automerger skipped] Merge "Remove the feature flag and dead code for the old time...
authorNeil Fuller <nfuller@google.com>
Tue, 13 Nov 2018 10:14:39 +0000 (02:14 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Nov 2018 10:14:39 +0000 (02:14 -0800)
am: e451323669  -s ours

Change-Id: Ic69bcf413d1028ebfb3e8c6a2212bffe42232ae1


Trivial merge