am 7a560701: am 335f043b: Merge "Add permission annotations on the AccountManager" into mnc-dev am: 20ccf13fbc
am: a4f3fa62a3

* commit 'a4f3fa62a36a0bcb0dfc3adae54bb802084cd690':