commit | 107d668f54862917007f13aa5bd6d277348b7ae1 | [log] [tgz] |
---|---|---|
author | Carmen Jackson <carmenjackson@google.com> | Fri Apr 28 23:37:07 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Apr 28 23:37:07 2017 +0000 |
tree | 62f491cbaae1cfe2ce45678ad148817ffc5293e5 | |
parent | bb9bfbb6012861863c44c964ea73313141a92db3 [diff] | |
parent | fce874a9aa5d3486bb392e0424a81d21da7e8659 [diff] |
Merge "Set the atrace clock to boot when possible and mono otherwise." into oc-dev am: e721536ec7 am: fce874a9aa Change-Id: I17305a489ed6e8ef40cfc85a8d1221f95645d129