diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-16 06:55:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-16 06:55:13 +0000 |
| commit | 4464aab3adbf4cb87e29a9c74ba42cea0c60e1fb (patch) | |
| tree | d35ac594ba4dc97dc002cb13eecf9cea0b748caa /libs/hwui/font/Font.h | |
| parent | e341572ecbc9d915b63295c861a5afb5504ee6b7 (diff) | |
| parent | 08d339fc20711ad1105c6f9b87b0bcb276ee7db1 (diff) | |
| download | frameworks_base-4464aab3adbf4cb87e29a9c74ba42cea0c60e1fb.zip frameworks_base-4464aab3adbf4cb87e29a9c74ba42cea0c60e1fb.tar.gz frameworks_base-4464aab3adbf4cb87e29a9c74ba42cea0c60e1fb.tar.bz2 | |
am 08d339fc: (-s ours) am 7ef55776: (-s ours) am e134ac1c: (-s ours) am e2a1f1cd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '08d339fc20711ad1105c6f9b87b0bcb276ee7db1':
Import translations. DO NOT MERGE
Diffstat (limited to 'libs/hwui/font/Font.h')
0 files changed, 0 insertions, 0 deletions