tree 03b3f0690153a68899a503dd38ad4e2beabb1097
parent aff4762aea29de8e0545ba97f1c6a74ec6c1b41e
parent d5df20a2f317c71be2b9df7e9f6537139c47f82b
author Elliott Hughes <enh@google.com> 1485503756 +0000
committer android-build-merger <android-build-merger@google.com> 1485503756 +0000

Merge "Support arbitrary-length properties in property_list." am: c8121ba029 am: 92aab6dbd1 am: be34e5661d
am: d5df20a2f3

Change-Id: I73e01d65fd3df3ae9f64c47e2d4148d2c055fb82