OSDN Git Service

am 18cc8cfa: (-s ours) am f1b81feb: (-s ours) am e5d39a52: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:35 +0000 (18:14 +0000)
commit038044bd0c20d60c45de4ae412ebb07c5b0929cc
tree3804e07840427a842ef1bdc750bffe2239123c26
parent95b8c90ba2aa4b48dec13a61ebfd1e1693e73e37
parent18cc8cfa592708c34d7f037cbb54949e9dc6f75a
am 18cc8cfa: (-s ours) am f1b81feb: (-s ours) am e5d39a52: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '18cc8cfa592708c34d7f037cbb54949e9dc6f75a':