tree 6a69f6598d8275436cfe9bc8389e9ed54a0a05bd
parent b1f1293355a1837d95095d28891f9218bdcf2bdd
parent 2d49752ee050ab7f1cd848933f6c62a73707e2d9
author Tor Norbye <tnorbye@google.com> 1431699672 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431699676 +0000

Merge "Add bluetooth permission annotations" into mnc-dev