commit | 3d2a664a426be706d293e895493ee96376b1de30 | [log] [tgz] |
---|---|---|
author | Matthew Xie <mattx@google.com> | Tue Oct 01 18:50:10 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 01 18:50:10 2013 -0700 |
tree | dcc517232e0cb5b4bd467f12e5c884636fdbfb6d | |
parent | 1cbb42dfea221111811693842a11b5bc88ce5724 [diff] | |
parent | 9eb9ebb2fbbe1135919cf685d84eba18cfecdf01 [diff] |
am 9eb9ebb2: am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields" into klp-dev * commit '9eb9ebb2fbbe1135919cf685d84eba18cfecdf01': Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields