3615c2c8a06cdb3d0efa344c6eb04709b416cf51 Merge "frameworks_base: CA translations" into cm-10.1