| commit | 50f08db8a9100b79d7284406eaf2daae3af6a371 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Mon Oct 21 16:07:44 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 21 16:07:44 2013 -0700 |
| tree | 1d5ab1e3f5ef6844b0b87a8610746f9d24a70da6 | |
| parent | 1763de2c204a587dcfc04fa4324e415dd070139a [diff] | |
| parent | 3755cde5fd20306f3965e7b317e3763640b11b42 [diff] |
am 3755cde5: am dce8f102: Merge "Change pairing api/intent permission from PRIVILEGED to ADMIN" into klp-dev * commit '3755cde5fd20306f3965e7b317e3763640b11b42': Change pairing api/intent permission from PRIVILEGED to ADMIN