OSDN Git Service

Merge "Move tests added in n-mr2 into new aosp location." am: 5511f7cfc2 am: ac6e0cc770
authorErik Kline <ek@google.com>
Tue, 17 Jan 2017 05:20:52 +0000 (05:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 05:20:52 +0000 (05:20 +0000)
commitb4f96a3172a844d9f9f0e5fea80a4a4e75cfb14e
treeb52462f38370c771750dda1c763b4d6b94a8d374
parent545049be250dda1a3c6756f1697632eeabfa3786
parentb1d431377776dc1185a5931bc922573f76bf232e
Merge "Move tests added in n-mr2 into new aosp location." am: 5511f7cfc2 am: ac6e0cc770
am: b1d4313777

Change-Id: I62688cacb486f55bb48ea55b14e4e3416493ea30