OSDN Git Service

am 9eb9ebb2: am 0e772b22: Merge "Unhide setPin, setPin, setPairingConfirmation, and...
authorMatthew Xie <mattx@google.com>
Wed, 2 Oct 2013 01:50:10 +0000 (18:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Oct 2013 01:50:10 +0000 (18:50 -0700)
commit3d2a664a426be706d293e895493ee96376b1de30
treedcc517232e0cb5b4bd467f12e5c884636fdbfb6d
parent1cbb42dfea221111811693842a11b5bc88ce5724
parent9eb9ebb2fbbe1135919cf685d84eba18cfecdf01
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
api/current.txt
core/res/AndroidManifest.xml
core/res/res/values/strings.xml