tree 97f82a0182ab33019b5a4b98790f74a2c1bbcf57
parent 27abaf483a066733a0a2066c54d452d6f21ec4f4
parent 83b3c5994e2b19ea867c548377e0532fcb49f3a0
author Shukang Zhou <shukang@google.com> 1485545910 +0000
committer android-build-merger <android-build-merger@google.com> 1485545910 +0000

Merge "[Frameworks] Add an 'am' cmd option to enable streaming in profiling." am: e924640c4b am: b0f03a64ea am: 221e58fe95  -s ours
am: 83b3c5994e

Change-Id: I88c81184669adf69686af3af649b5f602720e57b