OSDN Git Service

am 468592c2: (-s ours) am d313b92c: (-s ours) am 53304d69: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:31 +0000 (18:14 +0000)
commitda83b9d37295826c2223a924ec423ec04a897cdc
tree3804e07840427a842ef1bdc750bffe2239123c26
parent18156a558a6832682d81967ec40e15f828d3a973
parent468592c24df7f395b4a38589cb70a0f750afb6d6
am 468592c2: (-s ours) am d313b92c: (-s ours) am 53304d69: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbad

* commit '468592c24df7f395b4a38589cb70a0f750afb6d6':