OSDN Git Service

DO NOT MERGE: frameworks-test: adding missing @SmallTest am: cfcc1cb7bf -s ours...
authorHugo Benichi <hugobenichi@google.com>
Fri, 9 Dec 2016 11:14:43 +0000 (11:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 11:14:43 +0000 (11:14 +0000)
am: 58d1d2da68  -s ours

Change-Id: I349be4850debbdb6403ebf31d4478e800391bec5


Trivial merge