OSDN Git Service

am c2547639: am 5c39bb4f: am 6a275202: am 1e4adfa8: (-s ours) Merge commit \'8113e436...
authorBill Yi <byi@google.com>
Mon, 12 May 2014 23:30:48 +0000 (23:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:30:48 +0000 (23:30 +0000)
commitd1975e7915f5720e56af834e831cde6e0f9db062
treedb34eca2da5ec1662b262862fc44c323209fcb14
parentaaa3f1830926011a8e8a526615248840c59e5281
parentc2547639726dc56edd1087ee88bb8ee8f01e7cb6
am c2547639: am 5c39bb4f: am 6a275202: am 1e4adfa8: (-s ours) Merge commit \'8113e43601aac7702b9ec007e81a179826143d1e\' into HEAD

* commit 'c2547639726dc56edd1087ee88bb8ee8f01e7cb6':