OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a85c2a5 a2c40b1)
DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock...
authorFelipe Leme <felipeal@google.com>
Fri, 9 Dec 2016 11:02:22 +0000 (11:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 11:02:22 +0000 (11:02 +0000)
am: a2c40b19c6  -s ours

Change-Id: Ic3005458ec91655ce105c70569877cf5dd8a920b


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help