OSDN Git Service

Merge commit 'eba66c3' into master_merge
authorPrerepa Viswanadham <dham@google.com>
Fri, 1 May 2015 17:10:22 +0000 (10:10 -0700)
committerPrerepa Viswanadham <dham@google.com>
Fri, 1 May 2015 17:10:22 +0000 (10:10 -0700)
commit971cd2b952cda860bc4e40800abde04005c21fd0
tree37ae82c2a2d956cf9c4be0a3316473fcead3103b
parent7c298065fb5c6c86e3bb61a4021c54e27c85d14e
parenteba66c376afe8ec395a7e37b27dcea11bcfcefc0
Merge commit 'eba66c3' into master_merge
api/current.txt
api/system-current.txt
core/java/android/bluetooth/le/ScanSettings.java