tree ee77f60b68fef52bf01f6ca84dfeff08982e347f
parent 7c230c6f3c9f1ece465b83f3c03643b606f9d843
parent b0f03a64ea7e897bd93dc2e4e6b2e211f8004623
author Shukang Zhou <shukang@google.com> 1485543704 +0000
committer android-build-merger <android-build-merger@google.com> 1485543704 +0000

Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b
am: b0f03a64ea

Change-Id: I35fa80e43cd4f6af76099848714f838f217b7989