| commit | 530e58f91dda219a5c542129c00199ecbc09f630 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Mon Dec 17 23:45:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 17 23:45:32 2012 -0800 |
| tree | ac76b054dd2e2c2858f0e179c16b419f44247b89 | |
| parent | 99905c1fd4c0c79c280892ca51d226f163bef62b [diff] | |
| parent | 434956ab4ecd583c6fe0c1caa54773d254736024 [diff] |
am 434956ab: (-s ours) am 7570ca32: (-s ours) Merge "Import translations. DO NOT MERGE" * commit '434956ab4ecd583c6fe0c1caa54773d254736024':