tree 09feb9f96c0fb05713925f26fb66e30f24a1ec9c
parent 0522149f3d13b85f0e5d1ed2b1305c19a2679f54
parent be128f38d697ebb2f1483208eb27540dbdd6a3b4
author Vic Yang <victoryang@google.com> 1555459752 -0700
committer android-build-merger <android-build-merger@google.com> 1555459752 -0700

Merge "Fix linker compilation with timing enabled"
am: be128f38d6

Change-Id: Iaee80451d114030b36961a3ff2647bd4492f37b3