am 30667266: (-s ours) am 5bcb3876: Merge 2caa1d81ce - do not merge

* commit '30667266dd48326388ae3e2a62429d5766211bfc':
  Import translations. DO NOT MERGE
main
Jean-Baptiste Queru 2013-04-02 07:53:03 -07:00 committed by Android Git Automerger
commit a21bec1335

Diff Content Not Available