tree b49e06bce5c11b89bbdc8c544c61c757955854bb
parent c5d5be72a3da1a91c886721930165e80f66a02a0
parent 3ddf22e69cc329741b41b423a3b5d18d8c9e81aa
author Selim Gurun <sgurun@google.com> 1509747735 +0000
committer android-build-merger <android-build-merger@google.com> 1509747735 +0000

Merge "Respect Accessory timeout value when restoring defaults"
am: 3ddf22e69c

Change-Id: I3ee7b72ac335902ce2f9322f0dbedd48429dc663