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)
am: b1d4313777

Change-Id: I62688cacb486f55bb48ea55b14e4e3416493ea30


Trivial merge