tree e7fff48c2ad899a92b5bb5b83a14a3f05e2e70eb
parent 057668237ced3e654a6a13a9c5afcc6dd2321b10
parent 62fca012be1907f7def9d40351be1ae2ebf55520
author Yabin Cui <yabinc@google.com> 1494621252 +0000
committer android-build-merger <android-build-merger@google.com> 1494621252 +0000

Merge "simpleperf: make pprof_proto_generator.py work without binary_cache_dir." am: de5a219880
am: 62fca012be

Change-Id: I80073e30bdb126542dad9a42a9d0cd0ee485879b