summaryrefslogtreecommitdiffstats
path: root/telecomm/java
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2014-03-13 17:26:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-13 17:26:05 -0700
commit9efd842ff5ace243524c82293e4637eeda29a030 (patch)
tree424262520c2649951297720194e7b45f9274ad78 /telecomm/java
parentb72bc6c9268a3628b32130488d7b2737e53f8841 (diff)
parent25e41f4345c2e58e31c0e32507b6475107d9a286 (diff)
downloadframeworks_base-9efd842ff5ace243524c82293e4637eeda29a030.zip
frameworks_base-9efd842ff5ace243524c82293e4637eeda29a030.tar.gz
frameworks_base-9efd842ff5ace243524c82293e4637eeda29a030.tar.bz2
am 25e41f43: (-s ours) am e4f1c8ab: (-s ours) am c48e3d03: (-s ours) am 4c9ebc4c: (-s ours) am c6ccb8a3: (-s ours) am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '25e41f4345c2e58e31c0e32507b6475107d9a286': Import translations. DO NOT MERGE
Diffstat (limited to 'telecomm/java')
0 files changed, 0 insertions, 0 deletions