tree f84ed01022f912990b009323723b8fc952a62faf
parent 871cb5d53f14ce6ead2c65ee3a4354e22276a169
parent 8c99ab849e7d9c87bae3b20377af66ad266eba99
author Martijn Coenen <maco@google.com> 1382551926 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1382551926 +0000

Merge "Unhide BIND_NFC_SERVICE permission." into klp-dev