tree 8d9d4aa7316c206ea46151d09822d41c07809b22
parent 813f48e968cdf28fdfe14eb72668a2b72d494c50
parent 9515f91d9ed2410945b4a58139ce0b188c051c59
author Peter Qiu <zqiu@google.com> 1475776705 +0000
committer android-build-merger <android-build-merger@google.com> 1475776705 +0000

Merge "wifi: WifiEnterpriseConfig: use ParcelUtil to parcelize key and certificates" am: 05d950ee3b am: c1beaa3424
am: 9515f91d9e

Change-Id: Ie62a95760cefb678a5c53c9c394ee80e226563eb