diff options
| author | Ying Wang <wangying@google.com> | 2012-06-18 10:49:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-18 10:49:20 -0700 |
| commit | d7dddbd7cedc259f6eb1bb0ba9e1a1617783682e (patch) | |
| tree | d16980322abf701606b89ddd22edbb800369a82b /docs/html/sdk/api_diff/12 | |
| parent | 5ded10982c46c0f13cb8eeb4cc9ebec16baa3760 (diff) | |
| parent | 4f36ed500f975e1be1dd1246707db60332eaa374 (diff) | |
am 4f36ed50: (-s ours) am 2f8ee744: Merge "Import translations. DO NOT MERGE" into jb-dev
* commit '4f36ed500f975e1be1dd1246707db60332eaa374':
Import translations. DO NOT MERGE
Diffstat (limited to 'docs/html/sdk/api_diff/12')
0 files changed, 0 insertions, 0 deletions