OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 96320f6 713b4f6)
Merge "Parse -1 as WARNING_DISABLED in NetworkPolicyManager." into nyc-mr1-dev
authorFan Zhang <zhfan@google.com>
Wed, 14 Sep 2016 17:30:05 +0000 (17:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 14 Sep 2016 17:30:05 +0000 (17:30 +0000)
am: 713b4f65d2

Change-Id: I890d7668c0e3da8f0aec364c6ff63986ea036882


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