diff options
author | Baligh Uddin <baligh@google.com> | 2014-06-23 20:58:19 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-23 20:58:19 +0000 |
commit | ca1fb1ad6b3f8bd3b887e0c30a2a8ce475d523d5 (patch) | |
tree | bb1dc307c2e50e5df94e485cd50018c5c2ffe663 | |
parent | 0ce949dc2aab016e615ce640aba306e87c0c13a0 (diff) | |
parent | 1caf6b6630a4a134a5bab6d63b3c244b9ccc45a7 (diff) | |
download | android_frameworks_ex-ca1fb1ad6b3f8bd3b887e0c30a2a8ce475d523d5.tar.gz android_frameworks_ex-ca1fb1ad6b3f8bd3b887e0c30a2a8ce475d523d5.tar.bz2 android_frameworks_ex-ca1fb1ad6b3f8bd3b887e0c30a2a8ce475d523d5.zip |
am 1caf6b66: (-s ours) am c845eeac: (-s ours) Merge "Import translations. DO NOT MERGE"
* commit '1caf6b6630a4a134a5bab6d63b3c244b9ccc45a7':
0 files changed, 0 insertions, 0 deletions