tree 3203d2b82f2cbdc96dba59f9ff44ee0660ffe35b
parent 279f3d593fef224a25324800d03b61d256c1e4dd
parent 2369b1eb8095f42c16f05f553dd58683353ed65d
author Wei Wang <wvw@google.com> 1479354898 +0000
committer android-build-merger <android-build-merger@google.com> 1479354898 +0000

Merge changes from topic 'slow_log'
am: 2369b1eb80

Change-Id: Ib714a9e9cd22bca570399604a2b4ea3d6cfe9ed3