OSDN Git Service

am b07da381: am 44adb1ee: (-s ours) am 9baf2fd5: (-s ours) DO NOT MERGE cherrypick...
authorScott Main <smain@google.com>
Mon, 5 Nov 2012 23:39:59 +0000 (15:39 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:39:59 +0000 (15:39 -0800)
* commit 'b07da3812737997ecec4c4a980411b6a8d88caff':


Trivial merge