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