tree a8d45e378a58293f2d65e898b4b016ca923af5ee
parent 185275e0ad54b97e95273fd6895c2efb2d3e18a1
parent a2e068a2b4dde2df9d48e3e9508b6d0e43765401
author Marie Janssen <jamuraa@google.com> 1485360481 +0000
committer android-build-merger <android-build-merger@google.com> 1485360481 +0000

Merge "Make headset icons consistent before / after pairing" am: 690bdb22c9
am: a2e068a2b4

Change-Id: I036781f8908da81ea294abafaf6c72e9d03699c8