| commit | adc3d45f4f60301bf4fcdfafb599b71e83b59168 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Thu Oct 23 17:26:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 17:26:57 2014 +0000 |
| tree | cba62d0d64153aa2169651696bc238591341d679 | |
| parent | 729869eaeafbb39044479fd504e8a5570adbf97c [diff] | |
| parent | 785ca6bb42594fff4d8d9d45c8f08e736f5733c1 [diff] |
am 785ca6bb: (-s ours) am fd855986: (-s ours) am baa58811: (-s ours) am 751f5fdc: (-s ours) am eb0cc542: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose * commit '785ca6bb42594fff4d8d9d45c8f08e736f5733c1':