tree c6e4ccc48a1a1f05834dca298c0670517f1575c6
parent 648a66f3c80fa42afed4821fc5bea07d267b448c
parent 26b96f8948928946d025d19e96c91810f91bb0c6
author Android Build Merger (Role) <android-build-merger@google.com> 1497596117 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1497596122 +0000

Merge "Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev am: 3573dc7108 am: e35ddc1b27" into oc-dr1-dev-plus-aosp