Merge "Fix package name for LibStatsPullTests" into rvc-dev am: 1caf7459e3 am: a8fd1a20a1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988454

Change-Id: I791b64ab12b02a0488e688c5afe33e542167580d
This commit is contained in:
Howard Ro
2020-06-25 18:26:08 +00:00
committed by Automerger Merge Worker
2 changed files with 1 additions and 2 deletions

View File

@@ -33,7 +33,6 @@ import com.android.internal.os.StatsdConfigProto.PullAtomPackages;
import com.android.internal.os.StatsdConfigProto.SimpleAtomMatcher; import com.android.internal.os.StatsdConfigProto.SimpleAtomMatcher;
import com.android.internal.os.StatsdConfigProto.StatsdConfig; import com.android.internal.os.StatsdConfigProto.StatsdConfig;
import com.android.internal.os.StatsdConfigProto.TimeUnit; import com.android.internal.os.StatsdConfigProto.TimeUnit;
import com.android.internal.os.statsd.StatsConfigUtils;
import com.android.internal.os.statsd.protos.TestAtoms; import com.android.internal.os.statsd.protos.TestAtoms;
import com.android.os.AtomsProto.Atom; import com.android.os.AtomsProto.Atom;

View File

@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package com.android.internal.os.statsd; package com.android.internal.os.statsd.libstats;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;