diff options
author | Baligh Uddin <baligh@google.com> | 2014-02-20 18:47:45 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-20 18:47:45 +0000 |
commit | 17b7705afb3e36a6239fdcc3fadfa6601f32fe98 (patch) | |
tree | 9b4509e070e1a5aa5b484eaa3b52335c5b3f21f0 | |
parent | c87c6a2a4630e53d8dc07eb53095776fa31c463f (diff) | |
parent | fbb100c437d52db818e6e57c18ffe1e969ba46b0 (diff) | |
download | frameworks_base-17b7705afb3e36a6239fdcc3fadfa6601f32fe98.zip frameworks_base-17b7705afb3e36a6239fdcc3fadfa6601f32fe98.tar.gz frameworks_base-17b7705afb3e36a6239fdcc3fadfa6601f32fe98.tar.bz2 |
am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'fbb100c437d52db818e6e57c18ffe1e969ba46b0':
Import translations. DO NOT MERGE
0 files changed, 0 insertions, 0 deletions