OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 68b9d97 8ebd66c)
am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorMana...
authorAravind Akella <aakella@google.com>
Fri, 11 Apr 2014 19:40:31 +0000 (19:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Apr 2014 19:40:31 +0000 (19:40 +0000)
commitd951ab230d80631731ef12b5d76c678c30165d6a
tree62de29e78b420aab4917ed60001863e906940e80tree | snapshot
parent68b9d97593d2ec79892813ab06f1b89c41de64b0commit | diff
parent8ebd66c259602f6b0be26fdfd3fe2f55538f6424commit | diff
am 8ebd66c2: am cd4c1c71: Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev

* commit '8ebd66c259602f6b0be26fdfd3fe2f55538f6424':
  Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor
api/current.txt diff1 | diff2 | blob | history
core/res/AndroidManifest.xml diff1 | diff2 | blob | history
core/res/res/values/strings.xml diff1 | diff2 | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help