OSDN Git Service

am fe1fb21f: (-s ours) am b254270b: (-s ours) am 84004db4: (-s ours) Merge "Import...
authorBaligh Uddin <baligh@google.com>
Fri, 19 Sep 2014 03:43:22 +0000 (03:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 03:43:22 +0000 (03:43 +0000)
commit9b6a5e429e23cc5bdf0cf8a13741c30be964c5a5
tree00df68d02095af5c8fe29e15b76906d041aad047
parentabba362655776d63586fccc7188a96162b8dc5e8
parent271d4deb892effb562123d40434fd2cf03b576e6
am fe1fb21f: (-s ours) am b254270b: (-s ours) am 84004db4: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'fe1fb21f31629dc62778aadc7b5237c057167907':