[automerger skipped] Move gcov output to /data/misc/trace am: e6fa0a6a am:...
[automerger skipped] Move gcov output to /data/misc/trace am: e6fa0a6a am: 101e4375 -s ours am: a8d1de50 -s ours
am skip reason: Change-Id Ia6b94e26352dd66f5c6819f6157b4b73dd777a90 with SHA-1 360eb055 is in history
Change-Id: Ie82a968077becd21631ff8820cd7f953d2842791