OSDN Git Service

resolve merge conflicts of b84954cf92 to master.
authorRubin Xu <rubinxu@google.com>
Wed, 27 Jan 2016 00:43:38 +0000 (00:43 +0000)
committerRubin Xu <rubinxu@google.com>
Wed, 27 Jan 2016 00:43:38 +0000 (00:43 +0000)
commit7705a0d6ad04fb3c6f32c7700d09f13fdf7c9cee
tree1473174be94e8209994a41ab389ee3dd2ece8003
parenta74e729fa991064dd6eba8c49924b2a88efdc463
parentb84954cf92dbedd7ef3c4cd6868cad9e5b637d7d
resolve merge conflicts of b84954cf92 to master.

Change-Id: I8a5a1a989968c46ea4807db9e7e06b298244876d
api/current.txt
api/system-current.txt
wifi/java/android/net/wifi/WifiEnterpriseConfig.java