OSDN Git Service

am b9358143: (-s ours) am 6f1346f8: (-s ours) am d0fff8a7: (-s ours) Merge "Revert...
authorBaligh Uddin <baligh@google.com>
Wed, 30 Apr 2014 18:14:43 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:43 +0000 (18:14 +0000)
* commit 'b9358143036925d4a0fd88e3ee26b00d6f0eaf59':


Trivial merge