Merge frameworks_base : translation into cm-10.1

Change-Id: I0dcca69df1c11e6421a980a104f9a8d436495361