commit | d64131a83d486283c22d6f7c975a13a3fd0028da | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Oct 10 20:56:51 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 20:56:51 2012 -0700 |
tree | f5c53f17365993815876c49380672490c3f578a6 | |
parent | e361c45b145788931c55c704ae86df155a4229c2 [diff] | |
parent | a2e9f101bd2369d4d344d04c317882d1ef90058c [diff] |
am a2e9f101: (-s ours) am a7b29405: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev * commit 'a2e9f101bd2369d4d344d04c317882d1ef90058c': Import translations. DO NOT MERGE