OSDN Git Service

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
authorBill Yi <byi@google.com>
Tue, 6 Dec 2016 23:17:16 +0000 (15:17 -0800)
committerBill Yi <byi@google.com>
Tue, 6 Dec 2016 23:17:16 +0000 (15:17 -0800)
commit82834baa358f55acb542e17da828b2d497cf8332
tree35a57c84d9810438a92cb7036cab3bba96580a5b
parent800a4e753e991ea23b4c72568b3150b8c232aa6a
parent5b9b0db9f8532aea7c907d3f5ac8b7808b46c1c7
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Android.mk
api/system-current.txt
services/core/java/com/android/server/NetworkScoreService.java