tree 06467644c156434d6e7b1ce57dd0566b190dd01f
parent 970417c7d3e33ccbd6918e28d9bc5da24651f5b3
parent cd9a7bb3ba742606f93dcbd549d6d6eeb1cb5247
author Aravind Akella <aakella@google.com> 1397244758 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1397244758 +0000

Merge "Add stringType and requiredPermissions to SensorManager.java, as well as a permission for the heart rate sensor" into klp-modular-dev