| commit | 9eb9ebb2fbbe1135919cf685d84eba18cfecdf01 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Mon Sep 30 17:32:22 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 30 17:32:22 2013 -0700 |
| tree | 4c97249e8eb1d899337d9604e1049ef6a082adfd | |
| parent | 7d4e6365fb87c198ca54fc1d8e979b67d578c28a [diff] | |
| parent | 0e772b226801ca03292abad04677b1f7f29fade4 [diff] |
am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields" into klp-dev * commit '0e772b226801ca03292abad04677b1f7f29fade4': Unhide setPin, setPin, setPairingConfirmation, and relevant intent fields