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

* commit '20ccf13fbc685b96a8b1d4a59452143bec4fd711':