tree 69797abc27dba40aa7a926f1542e3716947a29a6
parent cc9ff706a42f1e6efe12674b1274f1b95489edea
parent 182d5ec2d2e141a17eec6d74a68677cfcd19e401
author Wale Ogunwale <ogunwale@google.com> 1498160721 +0000
committer android-build-merger <android-build-merger@google.com> 1498160721 +0000

Merge "Added more systrace points to window manager" into oc-dev
am: 182d5ec2d2

Change-Id: I6a1ac4ceee2ba943965382fc5cb7c782249b19a2