tree c9fc5234f00731e9b754473dc197a8d0bddaef06
parent 4b41613019829b40e8ca75a87219a415c51ae3a1
parent 57bda5037c0798c85388428a6d3a7771e1cc8034
author Matthew Xie <mattx@google.com> 1398124802 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1398124802 +0000

Merge "Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue"