OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e495347 05b9f21)
DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4. am: 77cba4bdf...
authorFelipe Leme <felipeal@google.com>
Fri, 9 Dec 2016 11:00:02 +0000 (11:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Dec 2016 11:00:02 +0000 (11:00 +0000)
am: 05b9f210af  -s ours

Change-Id: I9979e5411c032f500995efe7c83df31d40fda0f5


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