| commit | 1b562939899f7c91c437b390e6e216c7c53acfd6 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Tue Apr 22 13:36:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 22 13:36:22 2014 +0000 |
| tree | 433af0af0d16d060701b5500851594292c572374 | |
| parent | c352606db3258360fc32cf435c0ad23e55a1cc67 [diff] | |
| parent | 2e470dc48e608fd46cd2d55aa01efb9ce7eb4bdb [diff] |
am 2e470dc4: Merge "Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue" * commit '2e470dc48e608fd46cd2d55aa01efb9ce7eb4bdb': Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue