OSDN Git Service

am e09fbdf1: (-s ours) am d1b3e27b: (-s ours) am 4c89ec75: am 1b02bf12: (-s ours...
authorStephen Hines <srhines@google.com>
Thu, 5 Dec 2013 22:51:56 +0000 (22:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Dec 2013 22:51:56 +0000 (22:51 +0000)
* commit 'e09fbdf13f1170bc51ee51538c339973762f61ec':


Trivial merge