am d163b18c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit 'd163b18c155aa5bf34730bdc2467d3e759b4a269': Import translations. DO NOT MERGE Do not allow 0 or smaller periodicity for syncs. b/9295383 Save Notification large icon to extras. Workaround possible use after delete Do not block notifications or toasts for SYSTEM_UID or PHONE_UID. Don't orphan footers with transient state Bug #8725945 Avoid logging sensitive data.
This commit is contained in:
committed by
Android Git Automerger
commit
316ee71f18