OSDN Git Service

Merge "Fix ActivityRecordTests." into oc-dev am: 8592407581
authorBryce Lee <brycelee@google.com>
Wed, 5 Apr 2017 18:12:57 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Apr 2017 18:12:57 +0000 (18:12 +0000)
am: 772a7a51d2

Change-Id: Icb00c818e9c94c68ac7f813ea4aac7cd4be70429


Trivial merge