diff options
| author | Baligh Uddin <baligh@google.com> | 2014-05-21 15:43:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-21 15:43:30 +0000 |
| commit | bee9d71293ede690faefd2d36141aece893a9e71 (patch) | |
| tree | 2dfa515d7f0cd019b5c65777d6a6f94e1c49cc80 /api | |
| parent | fb1810e34f7d61b5b972bf42b09460659b17ee92 (diff) | |
| parent | 9472cadd2219fbe956ea6ba32853efc12abbf69f (diff) | |
| download | frameworks_base-bee9d71293ede690faefd2d36141aece893a9e71.zip frameworks_base-bee9d71293ede690faefd2d36141aece893a9e71.tar.gz frameworks_base-bee9d71293ede690faefd2d36141aece893a9e71.tar.bz2 | |
am 9472cadd: (-s ours) am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '9472cadd2219fbe956ea6ba32853efc12abbf69f':
Import translations. DO NOT MERGE
Diffstat (limited to 'api')
0 files changed, 0 insertions, 0 deletions