diff options
author | Eric Fischer <enf@google.com> | 2011-02-28 22:23:03 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-28 22:23:03 -0800 |
commit | 43cdf9b4191e18b5a4d646d23b06438c0e10b8dd (patch) | |
tree | deb009eea78d8c26d837112a1430a786aea69152 /core/java/android/annotation | |
parent | d86dbb9e00c998979db488a720ce263291f22c6a (diff) | |
parent | ae7fb4887394615b58c4e97fc5b1ad2e04441903 (diff) | |
download | frameworks_base-43cdf9b4191e18b5a4d646d23b06438c0e10b8dd.zip frameworks_base-43cdf9b4191e18b5a4d646d23b06438c0e10b8dd.tar.gz frameworks_base-43cdf9b4191e18b5a4d646d23b06438c0e10b8dd.tar.bz2 |
am ae7fb488: (-s ours) am 04a536af: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'ae7fb4887394615b58c4e97fc5b1ad2e04441903':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'core/java/android/annotation')
0 files changed, 0 insertions, 0 deletions