| commit | ddb1465f0be9fc042363e14808113c5ba33e435e | [log] [tgz] |
|---|---|---|
| author | Alex Klyubin <klyubin@google.com> | Thu Mar 09 19:34:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 09 19:34:10 2017 +0000 |
| tree | 0f68c7a6347b4a42d6149847f82c19aa8c8856b7 | |
| parent | 8cd9662214fc1c65693b4f74f9eb9fa55949a47a [diff] | |
| parent | 9586d54d2c5ab26ae357cec04514ce31f69e1a3a [diff] |
Merge "Support both locations of plat_property_contexts" am: 522690f450 am: c9d6d3a1d9 am: 9586d54d2c Change-Id: I1969d066b4d3f9bc367f0dc7f27fa2a03cbe2e98