tree e038501c3b4e2e65b10d51e21e791cab94c02055
parent 99756020334d9bfa337af4c9cb153e703b0145e4
parent 2c1d642709b1d15acd41de5b6ad4bdbdf2c40c0c
author Kevin Rocard <krocard@google.com> 1501121287 +0000
committer android-build-merger <android-build-merger@google.com> 1501121287 +0000

Merge "HAL in_get_parameters: do not return unknown keys" into oc-dr1-dev am: f07d6b39a3
am: 2c1d642709

Change-Id: I7e6f8dfb5ffd4469a53013bc9387d23ad12f82bc