OSDN Git Service

Merge changes Ibac27ee1,I336aeefd into nyc-dev
authorRobin Lee <rgl@google.com>
Thu, 21 Apr 2016 19:17:50 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 19:17:50 +0000 (19:17 +0000)
am: e2ae135d3c

* commit 'e2ae135d3c0612081eb6f23e37011e05136a6693':
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs

Change-Id: I93ffd1d56ca9ff4d8e9c8e16fc897e2368ae1260


Trivial merge